Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 18508)
+++ applications/editors/josm/i18n/po/ar.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-06 16:26+0000\n"
-"Last-Translator: metehyi <Unknown>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:14+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -48,18 +48,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
@@ -69,6 +69,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
@@ -76,11 +75,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
@@ -95,4 +94,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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "خطأ"
@@ -208,6 +209,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"
@@ -313,5 +314,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
@@ -329,6 +330,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
@@ -339,5 +340,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
@@ -456,5 +457,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
@@ -496,5 +497,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
@@ -503,6 +504,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"
@@ -684,5 +686,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
@@ -695,5 +697,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"
@@ -765,5 +767,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
@@ -771,28 +781,28 @@
 msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
 
-#: ../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 ""
 
-#: ../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}"
@@ -829,10 +839,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 "صدّر إلى 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 "صدّر المعطيات إلى ملف GPX..."
@@ -845,11 +855,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
@@ -880,5 +889,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
@@ -893,17 +901,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
@@ -963,5 +972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "ضمّ العقدة و الخط"
@@ -992,20 +1001,19 @@
 msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "إجهاض..."
-
-#: ../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 "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1146,7 +1154,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "جاري تحميل المعطيات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1293,10 +1300,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 "إحفَظ"
 
 #: ../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 "إحفظ المعطيات الحالية."
@@ -1351,10 +1358,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 "إحفظ كــ ..."
 
 #: ../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 "إحفظ المعطيات الحالية في ملف جديد."
@@ -1394,25 +1401,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 "اغلق"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -1424,5 +1431,5 @@
 msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق."
 
-#: ../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 "
@@ -1434,9 +1441,9 @@
 msgstr[1] ""
 
-#: ../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 "إنّ العقد المختارة لا تتقاسم نفس الطريق."
 
-#: ../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."
@@ -1444,10 +1451,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -1455,5 +1462,5 @@
 msgstr ""
 
-#: ../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 "
@@ -1461,5 +1468,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 "
@@ -1467,5 +1474,5 @@
 msgstr ""
 
-#: ../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"
@@ -1495,47 +1502,47 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "إختر أي من :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../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 "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو"
 
-#: ../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 ""
 
-#: ../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"
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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"
@@ -1545,9 +1552,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1555,5 +1562,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"
@@ -1600,5 +1607,5 @@
 #.
 #: ../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 ""
@@ -1614,6 +1621,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "إستبدل الخيار"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1627,10 +1635,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 "نسخ الكائنات  المختارة الى وسيط الصق"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "تحديث المعطيات"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1775,7 +1789,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "غيّر غرض {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1897,9 +1911,9 @@
 msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "جاري تحميل المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1907,5 +1921,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 ""
@@ -1921,7 +1935,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "إسم المستخدم."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1965,7 +1978,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "أخطاء عند التنزيل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1979,5 +1991,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
@@ -2008,6 +2020,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 "مُنتقى"
@@ -2025,26 +2037,26 @@
 msgstr "إضافة عقدة إلى طريق"
 
-#: ../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 ""
 
-#: ../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 "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../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 ""
 
-#: ../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 "انشئ عقدة جديدة"
 
-#: ../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 "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../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."
@@ -2053,46 +2065,42 @@
 msgstr[1] ""
 
-#: ../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 "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../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 "تابع طريق من العقدة الأخيرة."
 
-#: ../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 "إنهي الرسم."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "أنشئ مساحات"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../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 ""
-
-#: ../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:422
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr ""
 
@@ -2147,7 +2155,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
@@ -2174,67 +2190,70 @@
 msgstr ""
 
-#: ../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 "بحث..."
 
-#: ../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 "بحث عن أغراض."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "الرجاء إدخال مصطلحات البحث."
 
-#: ../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 "عبارة منتظمة"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "إستبدل الخيار"
 
-#: ../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 "أضف إلى اخيار"
 
-#: ../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 "أحذف من الخيار"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "عبارة منتظمة"
 
-#: ../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 ""
 
-#: ../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>\"شارع الفران\"</b> - 'شارع الفران' في أي مفتاح أو إسم."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2242,79 +2261,78 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>الأهداف المميزة:</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>النوع:</b> - نوع الغرض (<b>عقدة</b>, <b>طريق</b>, <b>علاقة</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>المستخدم:</b>... - كلّ الأغراض اللتي قام المستخدم بتغييرها"
 
-#: ../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>العقد:</b>... - الغرض ذات عدد العقد المحدد"
 
-#: ../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>العقد:</b>... - الغرض ذات عدد العقد المحدد"
-
-#: ../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>مغيير</b> - كلّ الأغراض المغييرة"
 
-#: ../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>المختارة</b> - كلّ الأغراض المختارة"
 
-#: ../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>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
 
-#: ../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>غير المسمات</b> - كلّ الأغراض غير المسمات"
 
-#: ../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 "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2324,51 +2342,51 @@
 msgstr ""
 
-#: ../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 "إبحث"
 
-#: ../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 "إبدء البحث"
 
-#: ../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 "لم أجد شيء مطابق لِــ ''{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 ""
 
-#: ../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 ""
 
-#: ../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} مطابقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2534,6 +2552,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
@@ -2659,5 +2677,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 ""
@@ -2678,9 +2696,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 "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+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"
@@ -2716,5 +2737,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 ""
@@ -2722,6 +2743,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."
@@ -2730,5 +2751,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2739,5 +2760,15 @@
 msgstr ""
 
-#: ../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"
@@ -2819,5 +2850,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"
@@ -2922,8 +2953,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 "القيمة الغيابية هي ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3103,5 +3140,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
@@ -3115,5 +3152,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 ""
@@ -3121,4 +3158,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3176,32 +3249,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "خطأ : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "تحذير: {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 ""
 
@@ -3226,45 +3300,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 "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../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
@@ -3275,6 +3332,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 ""
 
@@ -3285,145 +3343,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 ""
 
-#: ../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 "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#: ../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 "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../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 "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "دور غير معروف ''{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 "نوع عضو غير معروف لِــ ''{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 "لم أجد طريق \"من\""
 
-#: ../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 "لم أجد طريق \"إلى\""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "الطريق الداخلية ''{0}''موجودة في الخارج."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "النص"
 
-#: ../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 "خطأ : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "تحذير: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "خامل"
 
-#: ../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
@@ -3437,5 +3495,5 @@
 msgstr[5] "عقد"
 
-#: ../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
@@ -3449,6 +3507,6 @@
 msgstr[5] "طرقات"
 
-#: ../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
@@ -3462,13 +3520,13 @@
 msgstr[5] "علاقة"
 
-#: ../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 "طريق غير مسماة"
 
-#: ../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 "طريق غير كاملة"
 
-#: ../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
@@ -3476,5 +3534,5 @@
 msgstr "الخلفية"
 
-#: ../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 ""
@@ -3553,5 +3611,5 @@
 msgstr "لا تظهر مرة اخرى"
 
-#: ../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
@@ -3559,32 +3617,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 "غير كامل"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "من النوع طريق"
 
-#: ../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 "خط سكة حديد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "مجرى مياه"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "إستعمال الأرض"
 
-#: ../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"
@@ -3597,5 +3655,5 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3604,33 +3662,33 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../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
@@ -3638,9 +3696,9 @@
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "مضيف غير معروف"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3851,5 +3909,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 "حرّر"
@@ -3975,10 +4033,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 "الطبقة ليست في اللائحة."
 
-#: ../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"
@@ -4107,5 +4165,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"
@@ -4114,5 +4172,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"
@@ -4122,5 +4180,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 "الأعضاء"
@@ -4549,5 +4607,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 ""
@@ -4605,6 +4663,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 ""
@@ -4733,4 +4789,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"
@@ -4827,5 +4884,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"
@@ -4840,5 +4897,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"
@@ -4879,7 +4936,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "ادخل القيم لكل التناقضات."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4965,5 +5021,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
@@ -5057,5 +5113,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"
@@ -5111,11 +5167,11 @@
 msgstr "أعرض الخط الزمني للبنود المختارة."
 
-#: ../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
@@ -5123,13 +5179,13 @@
 msgstr "أعد التحميل"
 
-#: ../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 "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
 
-#: ../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 ""
@@ -5186,13 +5242,17 @@
 
 #: ../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] ""
-msgstr[1] ""
+msgstr[0] "غيّر غرض {0}"
+msgstr[1] "غيّر {0} غرضين"
+msgstr[2] "غيّر {0} أغراض"
+msgstr[3] "غيّر {0} غرض"
+msgstr[4] "غيّر {0} أغراض"
+msgstr[5] "غيّر {0} غرض"
 
 #: ../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 "قيمة فارغة ستمحي المفتاح."
 
@@ -5217,4 +5277,11 @@
 msgstr[1] ""
 
+#: ../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] ""
+msgstr[1] ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5291,60 +5358,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 "العلاقات"
 
-#: ../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 "إفتح لائحة بكل العلاقات."
 
-#: ../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 "العلاقات: {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 "إفتح محرر نص للعلاقة المحددة"
 
-#: ../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 "أمحي العلاقة المحددة"
 
-#: ../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 "أنشئ علاقة جديدة"
 
-#: ../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 "أمحي العلاقة المحددة"
-
-#: ../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 "إختر أي من :"
-
-#: ../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 "أمحي العلاقة المحددة"
-
-#: ../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 "نزّل الأعضاء"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5499,5 +5562,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}"
@@ -5736,18 +5799,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 ""
@@ -5770,5 +5833,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}"
@@ -5850,12 +5913,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "أنشئ مساحات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5866,7 +5927,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 "الرجاء إدخال إسم للموقع."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5876,12 +5936,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5970,7 +6028,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "أمحي الطبقة المختارة."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5983,17 +6040,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "أغلق الحوار و الغي التنزيل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "الرجاء إختيار أربعة عقد على الأقل."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6009,7 +6063,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "أدخل إسم المكان للبحث عنه:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6023,7 +6076,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "بحث..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6957,7 +7009,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "قرب"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7002,5 +7053,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 ""
@@ -7014,5 +7065,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 ""
@@ -7023,5 +7074,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 ""
@@ -7030,19 +7081,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 ""
@@ -7052,32 +7103,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 ""
@@ -7099,37 +7150,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 ""
@@ -7137,5 +7188,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 ""
@@ -7143,9 +7194,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 ""
@@ -7154,24 +7205,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 "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../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}"
@@ -7184,4 +7245,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "زوم الى {0}"
+
+#: ../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 "التاريخ"
+
+#: ../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
@@ -7194,17 +7273,66 @@
 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
+msgid "not present"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "المستخدِم"
 
-#: ../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 "مجهول"
+
+#: ../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 "بدون ذكر الإسم"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7229,4 +7357,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 "الإصدار {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "تم حذفه"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7571,13 +7714,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] "الأغراض اللتي يجب تغييرها:"
-msgstr[1] "الأغراض اللتي يجب تغييرها:"
-msgstr[2] "الأغراض اللتي يجب تغييرها:"
-msgstr[3] "الأغراض اللتي يجب تغييرها:"
-msgstr[4] "الأغراض اللتي يجب تغييرها:"
-msgstr[5] "الأغراض اللتي يجب تغييرها:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7657,13 +7796,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
@@ -7730,5 +7869,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}..."
@@ -7740,5 +7879,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 ""
@@ -7764,5 +7903,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"
@@ -7821,43 +7960,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"
 
 #: ../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 ""
 
 #: ../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 "إستعمل الإعدادات العامة."
 
 #: ../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 "أرسم خطوط بين النقاط لهذه الطبقة."
 
 #: ../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 "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
 #: ../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 "حدد خيارات رسم الخطوط"
 
 #: ../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 "خصّص اللون"
 
 #: ../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"
@@ -7865,6 +8004,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"
@@ -7954,10 +8093,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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."
@@ -7967,43 +8106,43 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../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 "محوّل من: {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 "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../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 "نزّل كلّ شيئ بين:"
 
-#: ../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} أمتار"
 
-#: ../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 "المساحة القصوى للمطلب:"
 
-#: ../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} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8012,9 +8151,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8022,5 +8161,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8064,8 +8203,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8079,47 +8214,38 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "أغلق الحوار و الغي التنزيل"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, 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} ممحي.)"
-msgstr[1] " ({0} ممحي.)"
-msgstr[2] " ({0} ممحي.)"
-msgstr[3] " ({0} ممحي.)"
-msgstr[4] " ({0} ممحي.)"
-msgstr[5] " ({0} ممحي.)"
-
-#: ../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} يتألف من:"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -8127,5 +8253,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"
@@ -8134,5 +8260,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"
@@ -8144,5 +8270,5 @@
 msgstr[5] "نقاط"
 
-#: ../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"
@@ -8151,5 +8277,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8158,5 +8284,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8169,9 +8295,9 @@
 msgstr[5] "{0} نقطة"
 
-#: ../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 ""
 
-#: ../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"
@@ -8183,5 +8309,5 @@
 msgstr[5] "دالات"
 
-#: ../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"
@@ -8190,14 +8316,14 @@
 msgstr[1] ""
 
-#: ../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 "مزامنة الصوت"
 
-#: ../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 ""
 
-#: ../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
@@ -8205,14 +8331,14 @@
 msgstr "تمّت مزامنة الصوت على النقطة {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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8220,13 +8346,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "أعرض/أخفي النص/الأيقونات"
 
-#: ../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 ""
@@ -8290,5 +8416,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 ""
@@ -8302,5 +8428,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."
@@ -9013,12 +9139,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "حرّك العقد المحددة إلى الحلقة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9032,17 +9156,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "أضف تعليق"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "إنعاش لائحة الخيارات."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "أمحي العلاقة المحددة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9660,5 +9781,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}''."
@@ -9685,5 +9806,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}."
@@ -9691,5 +9812,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}"
@@ -9702,5 +9823,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}''."
@@ -9851,5 +9972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9858,38 +9979,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 ""
@@ -9897,19 +10018,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 ""
 
-#: ../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 "غرض غير مسموح به معروف بــ 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 ""
@@ -9920,9 +10041,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 ""
@@ -9932,25 +10053,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 ""
@@ -9958,5 +10079,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9965,5 +10086,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9971,5 +10092,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9978,13 +10099,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 "حضّر المعطيات أو.أس.أم ..."
 
-#: ../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 ""
@@ -10136,8 +10257,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10199,7 +10316,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "حدّث"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10330,35 +10446,4 @@
 "{0}"
 msgstr ""
-
-#. 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 "مجهول"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10968,47 +11053,46 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "أنقل الطبقة المختارة صفّ إلى الأعلى."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11024,24 +11108,24 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "خطء عند تحليل {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 "لم أتمكن من قراءة \"{0}\""
 
-#: ../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."
@@ -11050,34 +11134,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11085,69 +11169,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11156,9 +11240,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11167,65 +11251,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11233,13 +11317,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11260,5 +11344,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11271,37 +11355,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11313,18 +11397,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11351,34 +11435,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "تمكين الإخباء التلقائي"
 
-#: ../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 "حجم الخابية الأقصى (م. بايت)"
 
-#: ../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."
@@ -11390,18 +11474,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11409,5 +11493,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11415,74 +11499,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11490,30 +11574,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11521,29 +11605,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11552,13 +11636,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"
@@ -11566,5 +11650,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"
@@ -11572,14 +11656,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"
@@ -11587,14 +11671,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"
@@ -11602,64 +11686,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 "حمّل الموقع من الخابية ( فقط عند تمكين الخابية)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11667,25 +11751,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "إستعادة كعكة الإنترنت"
 
-#: ../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 "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
 
-#: ../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
@@ -11695,14 +11779,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11710,5 +11794,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
@@ -11716,5 +11800,5 @@
 msgstr ""
 
-#: ../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"
@@ -11722,34 +11806,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11758,18 +11842,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11876,9 +11960,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11895,11 +11979,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 ""
 
 #: ../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 ""
@@ -11909,5 +11993,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 ""
@@ -12117,5 +12201,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12537,5 +12621,5 @@
 msgstr "الزاوية بين عقدتين محددتين"
 
-#: ../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 ""
@@ -12614,5 +12698,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12745,7 +12829,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "الطبقات"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12909,42 +12992,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 ""
 
-#: ../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 "تكبير/تصغير"
-
-#: ../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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -12980,7 +13062,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "نسبة التكبير/التصغير"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13325,6 +13406,6 @@
 msgstr ""
 
-#: ../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
@@ -13332,5 +13413,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13417,5 +13498,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13544,18 +13625,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13707,80 +13788,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13788,86 +13869,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14042,17 +14123,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14103,13 +14184,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14153,61 +14234,64 @@
 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 "نزّل"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم"
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "إدمج {0} عقد"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "مساعدة"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "المساعدة / حول"
-
-#: ../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 ""
 
@@ -14310,28 +14394,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14342,55 +14426,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -18812,14 +18896,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "موقع أثري"
+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 "حرّر موقع أثري"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26788,78 +26870,66 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "لا يمكن العثور عن الملف"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "علاقة متناقضة"
+#~ msgid "help"
+#~ msgstr "مساعدة"
+
+#~ msgid "Help / About"
+#~ msgstr "المساعدة / حول"
+
+#~ msgid "Unknown version"
+#~ msgstr "نسخة مجهولة"
+
+#~ msgid "false"
+#~ msgstr "خاطئ"
+
+#~ msgid "true"
+#~ msgstr "حقيقي"
+
+#~ msgid "different"
+#~ msgstr "مختلف"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "Move"
+#~ msgstr "حرك"
+
+#~ msgid "unnamed"
+#~ msgstr "غيرمسمى"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "إمتداد ملف غير معروف."
+
+#~ msgid "Email"
+#~ msgstr "البريد الإلكتروني"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "مسموح فقط عقدتين"
+
+#~ msgid "No data imported."
+#~ msgstr "لم يتم تحميل أي معطيات"
+
+#~ msgid "Data Layer"
+#~ msgstr "طبقة المعطيات"
+
+#~ msgid "Open in Browser"
+#~ msgstr "إفتح في المتصفح"
 
 #~ msgid "File not found"
 #~ msgstr "لم يُعثر على الملف"
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "إختر أولاً إشارة مرجعية"
-
 #~ msgid "Please enter a search string"
 #~ msgstr "الرجاء إدخال مصطلحات البحث"
 
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
+#~ msgid "zoom"
+#~ msgstr "تكبير/تصغير"
 
 #~ msgid "name"
 #~ msgstr "الإسم"
-
-#~ msgid "zoom"
-#~ msgstr "تكبير/تصغير"
-
-#~ msgid "Unknown version"
-#~ msgstr "نسخة مجهولة"
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "unnamed"
-#~ msgstr "غيرمسمى"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "إمتداد ملف غير معروف."
-
-#~ msgid "Email"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "مسموح فقط عقدتين"
-
-#~ msgid "No data imported."
-#~ msgstr "لم يتم تحميل أي معطيات"
-
-#~ msgid "Data Layer"
-#~ msgstr "طبقة المعطيات"
-
-#~ msgid "Open in Browser"
-#~ msgstr "إفتح في المتصفح"
 
 #~ msgid "citymap"
@@ -26875,4 +26945,10 @@
 #~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
 
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "إختر أولاً إشارة مرجعية"
+
 #~ msgid "<nd> has zero ref"
 #~ msgstr "لا يوجد لــ <nd>  أي مرجع"
@@ -26938,4 +27014,7 @@
 #~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
 
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
+
 #~ msgid "bicyclemap"
 #~ msgstr "خريطة راكب دراجة"
@@ -26958,4 +27037,7 @@
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "محرّر العلاقات: {0}"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "علاقة متناقضة"
 
 #~ msgid "Cannot open preferences directory: {0}"
@@ -26986,7 +27068,4 @@
 #~ msgstr "عقدة واحدة محددة فقط"
 
-#~ msgid "Update Data"
-#~ msgstr "تحديث المعطيات"
-
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "بعض العقد موجودة (تقريباً) في الخطّ"
@@ -26995,4 +27074,7 @@
 #~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "خطء عند تحميل الصفحة {0}"
@@ -27060,4 +27142,7 @@
 #~ msgid "Charge"
 #~ msgstr "رسم الدخول / الإستعمال"
+
+#~ msgid "File could not be found."
+#~ msgstr "لا يمكن العثور عن الملف"
 
 #~ msgid "Unsaved Changes"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 18508)
+++ applications/editors/josm/i18n/po/bg.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-11-04 06:14+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 15:14+0000\n"
 "Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@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:20+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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "Грешка"
@@ -208,6 +209,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
@@ -463,5 +464,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
@@ -503,5 +504,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
@@ -510,6 +511,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"
@@ -695,5 +697,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
@@ -706,5 +708,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 "Параметърът ''{0}'' не трябва да е празен"
 
-#: ../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 "{0} конфликт(а) при въвеждането"
 
-#: ../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 "({0}/{1}) Зареждане на родителите на възел {2}"
 
-#: ../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 "({0}/{1}) Зареждане на родителите на път {2}"
 
-#: ../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}"
@@ -842,10 +852,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 "Експорт до 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 "Експорт на данните до GPX файл."
@@ -858,11 +868,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
@@ -893,5 +902,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
@@ -906,17 +914,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
@@ -976,5 +985,5 @@
 msgstr "Включване на точката към състава на най-близката линия от път."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Свързване на точка с линия"
@@ -1005,22 +1014,19 @@
 msgstr "Моля, изберете поне две точки за обединение."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Прекъсване..."
-
-#: ../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 ""
-"Точките не могат да се обединят: Ще трябва да се изтрие линия, който вече се "
-"използва."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1161,7 +1167,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Сваляне на данни"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1312,10 +1317,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 "Запазване"
 
 #: ../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 "Запазване на текущите данни."
@@ -1372,10 +1377,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 "Запазване като…"
 
 #: ../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 "Записване на текущите данни в нов файл."
@@ -1419,25 +1424,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 "Затваряне"
 
-#: ../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 "Разделяне на линия"
 
-#: ../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 "Разделяне на линията в избраната точка."
 
-#: ../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 "Текушата селекция не може да се използва за разделяне."
 
-#: ../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."
@@ -1445,5 +1450,5 @@
 msgstr[1] "Избраните точки не са в средата на път."
 
-#: ../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 "
@@ -1459,9 +1464,9 @@
 "изберете и пътя."
 
-#: ../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 "Избраните точки не се явяват част от един и същ път."
 
-#: ../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."
@@ -1469,6 +1474,6 @@
 msgstr[1] "Избраният път не съдържа избраните точки"
 
-#: ../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 ""
@@ -1476,5 +1481,5 @@
 "път."
 
-#: ../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 "
@@ -1484,5 +1489,5 @@
 "средата на пътя.)"
 
-#: ../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 "
@@ -1492,5 +1497,5 @@
 "<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
 
-#: ../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 "
@@ -1500,5 +1505,5 @@
 "го проверите и коригирате ако е необходимо.</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"
@@ -1528,38 +1533,38 @@
 msgstr "Дублиране на точки, които се използват от няколко линии."
 
-#: ../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 "Тази точка не е свързана с към нещо друго."
 
-#: ../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 "Никой от тези точки не са прикрепени за нещо друго."
 
-#: ../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 "Нито една от тези тези линии не е прикрепена за други"
 
-#: ../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 "Текущато избраните обекти не може да се разсъединят."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Изберете един от вариантите:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Един маркиран възел, или"
 
-#: ../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 "* Една точка, която се използва от няколко линии, или"
 
-#: ../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 ""
 "* Една точка, която се използва от няколко линии и една от тези линии, или"
 
-#: ../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"
@@ -1567,5 +1572,5 @@
 "* Една линия, която има точки, които се използват от няколко линии, или"
 
-#: ../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."
@@ -1574,5 +1579,5 @@
 "няколко линии."
 
-#: ../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"
@@ -1585,9 +1590,9 @@
 "дублирани възли и всички възли ще бъдат избрани."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Незапелен възел"
 
-#: ../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"
@@ -1595,5 +1600,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"
@@ -1634,12 +1639,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "качване на всички промени в текущия слой данни към сървър на OSM."
+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 ""
@@ -1655,5 +1659,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Обновяване на избраните елементи"
 
@@ -1668,5 +1673,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Няма избрани примитиви за обновяване."
 
@@ -1674,4 +1680,9 @@
 msgid "Selection empty"
 msgstr "Няма нищо избрано."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Обновяване на избраните елементи"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1681,7 +1692,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 "качване на всички промени в текущия слой данни към сървър на OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1832,13 +1842,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Качване на данни..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1955,9 +1964,9 @@
 msgstr "Свалени GPX данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Сваляне на данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1966,5 +1975,5 @@
 "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
 
-#: ../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 "В тази зона няма намерени данни"
@@ -1980,7 +1989,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "видимо (на сървъра)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1996,7 +2004,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Прекъсване на качването и продължаване с редактирането"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2015,7 +2022,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Следните грешки се получиха по време на масовото сваляне:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2025,7 +2032,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Грешки при Сваляне"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2039,5 +2045,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
@@ -2071,6 +2077,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 "избран"
@@ -2088,26 +2094,26 @@
 msgstr "Добавяне на точка в път"
 
-#: ../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 "Свързване на съществуващ път към точка"
 
-#: ../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 "Добавяне на нова точка към съществуващ път"
 
-#: ../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 "Добавяне на точка към път и съединяване"
 
-#: ../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 "Създаване нов възел."
 
-#: ../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 "Избиране на точката под курсора."
 
-#: ../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."
@@ -2116,47 +2122,46 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../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 "Започване на нов път от последния възел."
 
-#: ../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 "Продължаване на път от последния възел."
 
-#: ../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 "Завършване на чертането."
 
-#: ../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 "Изтегляне"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Създаване на области"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Изтегляне на линии"
 
-#: ../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 "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Нарисувайте правоъгълник от желания размер и отпуснете бутона на мишката."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Нарисувайте правоъгълник от желания размер и отпуснете бутона на мишката."
 
-#: ../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 "Отпуснете бутона на мишката за да спрете въртенето."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Нарисувай сегмент от път за да се образува правоъгълник."
 
@@ -2214,4 +2219,8 @@
 msgstr "Винаги да се премества и този прозорец да не се показва повече"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2220,4 +2229,8 @@
 "Отпуснете бутона на мишката за да спрете местенето. Ctrl за да обедините с "
 "най-близката точка."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Отпуснете бутона на мишката за да спрете въртенето."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2248,67 +2261,70 @@
 "десния бутон на мишката"
 
-#: ../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 "Търсене..."
 
-#: ../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 "Търсене на обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Не може да се търси защото няма заредени данни"
-
-#: ../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 "Моля, въведете низ за търсене."
 
-#: ../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 "регулярен израз"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "замени селекцията"
 
-#: ../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 "добави към селекцията"
 
-#: ../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 "изтрий от селекцията"
 
-#: ../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 "чувствителност към регистъра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "регулярен израз"
 
-#: ../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>Baker Street</b> - 'Baker' и 'Street' в кой да е ключ или име."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' в кой да е ключ или име."
 
-#: ../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:Bak</b> - 'Bak' където и да е в името."
 
-#: ../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> - ключ 'type' със стойност именно '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>, "
@@ -2318,57 +2334,56 @@
 "<b>*=value</b>, <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:Bak</b> - няма 'Bak' в името."
 
-#: ../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> - ключ=foot, независимо от стойността."
 
-#: ../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>Специални цели:</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>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</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>user:</b>... - всички обекти, променени от зададения потребител"
 
-#: ../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 "<b>id:</b>... - обект с дадено ID (0 за нови обекти)"
 
-#: ../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>... - обекти с дадено количество възели / точки"
 
-#: ../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>... - обекти с дадено количество възели / точки"
-
-#: ../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> - всички променени обекти"
 
-#: ../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> - всички избрани обекти"
 
-#: ../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> - всички непълни обекти"
 
-#: ../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>untagged</b> - всички немаркирани обекти"
 
-#: ../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"
@@ -2376,5 +2391,5 @@
 "<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
 
-#: ../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"
@@ -2382,9 +2397,9 @@
 "<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
 
-#: ../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 "Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
 
-#: ../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 ""
@@ -2392,9 +2407,9 @@
 "ключ съдържа двоеточие)"
 
-#: ../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 "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
 
-#: ../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
@@ -2404,51 +2419,51 @@
 msgstr "Филтър"
 
-#: ../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 "Търсене"
 
-#: ../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 "Стартиране търсене"
 
-#: ../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 "Не е намерено съвпадение за ''{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 "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
 
-#: ../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 "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
 
-#: ../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} съвпадения"
 
-#: ../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"
@@ -2502,16 +2517,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Грешен брой параметри на оператора за точки."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Некоректна стойност на оператора за възли: {0}. Операторът за възли очаква "
-"числова стойност, възел или диапазон, например, 10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2633,6 +2645,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
@@ -2759,5 +2771,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 ""
@@ -2779,9 +2791,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 "Параметърът ''{0}'' не трябва да е празен."
+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"
@@ -2817,5 +2832,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 "Разделяне пътен сегмент"
@@ -2823,6 +2838,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."
@@ -2834,5 +2849,5 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Потвърждение за изтриване"
@@ -2843,5 +2858,15 @@
 msgstr "Разрешаване на конфликтите в изтрито състояние в {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"
@@ -2927,5 +2952,5 @@
 msgstr "Разрешаване {0} конфликтиращи маркери в релация {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3032,8 +3057,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 "Текущата стойност е ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3162,9 +3193,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
 msgstr ""
-"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
-"сигурността. Изключение на ОС: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3223,5 +3252,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
@@ -3235,5 +3264,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 ""
@@ -3241,4 +3270,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 "Липсват параметри за \"НЕ\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Историята на отношение {0}"
+
+#: ../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 ""
 
@@ -3296,33 +3361,34 @@
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Грешка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Предупреждение: {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 "Очакваше се ID >= 0. Имаме: {0}."
 
-#: ../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 "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../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 "Очаква се ID > 0. Имаме {0}."
 
-#: ../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 "Очакваше се Version > 0. Имаме: {0}."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3346,45 +3412,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 "Няма примитив с версия {0} в тази история"
-
-#: ../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 "Няма валидна версия от дата ''{0}'' в тази история"
-
-#: ../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 "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
+#: ../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 "Не е намерен примитив с id = {0} в тази база данни"
-
-#: ../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 "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
-
-#: ../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
@@ -3395,6 +3444,7 @@
 msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''"
 
@@ -3405,145 +3455,145 @@
 msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
 
-#: ../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 "Път, обознаващ граница на област, не е затворен."
 
-#: ../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 "мултиполигонен път ''{0}'' не е затворен."
 
-#: ../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 "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../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 "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../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 "Повече от един път \"от\" са намерени."
 
-#: ../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 "Повече от един път \"до\" са намерени."
 
-#: ../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 "Повече от един \"през\" са открити."
 
-#: ../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 "Неизвестна роля ''{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 "Неизвестен тип членство за ''{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 "Не е намерен път \"от\"."
 
-#: ../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 "Не е намерен път \"до\"."
 
-#: ../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 "Не е открит възел или път \"през\"."
 
-#: ../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 "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../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 "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../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 "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../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 "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../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 "Стил за ограничение {0} не е намерен."
 
-#: ../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 "Пресичане между пътища ''{0}'' и ''{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 "Вътрешният път ''{0}'' се намира отвън."
 
-#: ../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 "Няма подходяща роля ''{0}'' за Път ''{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 "Не-Път ''{0}'' в мултиполигон."
 
-#: ../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 "Липсва външен път за мултиполигон ''{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 "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../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 "Стилът за външния път ''{0}'' се разминава."
 
-#: ../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 "немаркиран"
 
-#: ../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 "текст"
 
-#: ../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 "Грешка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Предупреждение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "неактивен"
 
-#: ../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
@@ -3553,5 +3603,5 @@
 msgstr[1] "възли"
 
-#: ../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
@@ -3561,6 +3611,6 @@
 msgstr[1] "пътища"
 
-#: ../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
@@ -3570,13 +3620,13 @@
 msgstr[1] "релации"
 
-#: ../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 "немаркиран път"
 
-#: ../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 "незавършен път"
 
-#: ../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
@@ -3584,5 +3634,5 @@
 msgstr "фон"
 
-#: ../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 "подчертай"
@@ -3669,5 +3719,5 @@
 msgstr "Да не се показва повече"
 
-#: ../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
@@ -3675,32 +3725,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 "непълен"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "път / магистрала"
 
-#: ../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 "железопътна линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "водоеми"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "земеползване"
 
-#: ../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"
@@ -3709,5 +3759,5 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3716,33 +3766,33 @@
 msgstr[1] "{0} члена"
 
-#: ../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
@@ -3750,9 +3800,9 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Неизвестен хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Обектът е изтрит"
@@ -3774,7 +3824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Затваряне на диалоговия прозорец"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3972,5 +4021,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 "Редактиране"
@@ -4096,10 +4145,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 "слоя не е в списъка."
 
-#: ../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"
@@ -4107,7 +4156,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Не, отказване на операцията"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4230,5 +4278,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"
@@ -4237,5 +4285,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"
@@ -4245,5 +4293,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 "Членове"
@@ -4679,5 +4727,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 "Не, изход"
@@ -4737,6 +4785,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 "<неопределено>"
@@ -4865,4 +4911,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"
@@ -4959,5 +5006,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"
@@ -4968,5 +5015,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"
@@ -4985,7 +5032,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Запази моят"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -5008,7 +5054,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Установява роля за избраните членове"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5028,7 +5073,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5095,5 +5139,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
@@ -5187,5 +5231,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"
@@ -5241,11 +5285,11 @@
 msgstr "Показване историята на всички избрани обекти."
 
-#: ../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
@@ -5253,13 +5297,13 @@
 msgstr "Презареди"
 
-#: ../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 "Презареждане на всички текущо избрани обекти и опресняване на списъка."
 
-#: ../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 "Показване историята на избраните елементи."
@@ -5316,7 +5360,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] "Това ще промени до {0} обект."
@@ -5324,5 +5367,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 "Празна стойност изтрива ключа."
 
@@ -5347,4 +5391,11 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
+#: ../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] "Това ще промени до {0} обект."
+msgstr[1] "Това ще промени до {0} обекта"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5421,60 +5472,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 "Връзки"
 
-#: ../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 "Отваряне списъка с всички релации"
 
-#: ../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 "Връзки: {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 "Редактиране на релацията"
 
-#: ../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 "Изтриване на избраната връзка"
 
-#: ../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 "Създаване на нова релация"
 
-#: ../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 "Изтриване на избраната връзка"
-
-#: ../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 "Изберете един от вариантите:"
-
-#: ../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 "Свали избраните връзки"
-
-#: ../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 "Сваляне членове"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5633,5 +5680,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}"
@@ -5870,18 +5917,19 @@
 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
+#, fuzzy
+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 ""
@@ -5904,5 +5952,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}"
@@ -5973,7 +6021,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Няма отворен сисък с промени."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -5985,12 +6032,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Създаване на граница"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Преместване на текущо избраните членове надолу"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6001,7 +6046,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 "Моля въведете име на мястото."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6011,12 +6055,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Преместване на текущо избраните членове нагоре"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Преместване на текущо избраните членове нагоре"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6076,7 +6118,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Разделяне на линията в избраната точка."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6085,7 +6126,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Избраният път не съдържа избраната точка."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6109,7 +6149,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Не е избрана връзка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6128,12 +6167,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Преместване на текущо избраните членове нагоре"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Моля, изберете ред за редактиране"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6149,7 +6186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Въведете име на място за търсене:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6163,12 +6199,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Търсене..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Посока в която да се търси земя"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7098,7 +7132,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "близо"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7143,5 +7176,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 ""
@@ -7155,5 +7188,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 ""
@@ -7164,5 +7197,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 ""
@@ -7171,19 +7204,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 ""
@@ -7193,32 +7226,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 ""
@@ -7240,37 +7273,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 "Историята на възел {0}"
 
-#: ../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 "историята на път {0}"
 
-#: ../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 "Историята на отношение {0}"
 
-#: ../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 ""
@@ -7278,5 +7311,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 ""
@@ -7284,9 +7317,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 ""
@@ -7295,24 +7328,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 "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
+#: ../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}"
@@ -7325,4 +7368,22 @@
 msgstr "Възел {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Показване на проблема"
+
+#: ../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 "Зареди историята"
+
+#: ../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
@@ -7335,17 +7396,67 @@
 msgstr "Връзка {0}"
 
-#: ../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 "Сортиране меню шаблони"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Потребител"
 
-#: ../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 "неизвестно"
+
+#: ../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 "Анонимно"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7370,4 +7481,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Версия {0} създадена на {1} от {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "изтрито"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Версия {0} създадена на {1} от {2}"
 
@@ -7714,9 +7840,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] "{0} обект за промяна:"
-msgstr[1] "{0} обекта за промяна:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7799,13 +7925,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
@@ -7872,5 +7998,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}..."
@@ -7882,5 +8008,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 "Изображения с данни за местоположение"
@@ -7906,5 +8032,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"
@@ -7959,43 +8085,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 точка"
 
 #: ../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 "Настройка рисуването на линии"
 
 #: ../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 "Използвай глобалните настройки."
 
 #: ../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 "Чертай линии между точките на този слой."
 
 #: ../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 "Не чертай линии между точките на този слой."
 
 #: ../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 "Избиране варианти за чертане на линиите."
 
 #: ../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 "Избор цвят"
 
 #: ../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"
@@ -8003,6 +8129,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"
@@ -8092,10 +8218,10 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../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 "Преобразувай в слой данни"
 
-#: ../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."
@@ -8105,43 +8231,43 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../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 "Преобразувано от: {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 "Свали от OSM по дължина на тази следа"
 
-#: ../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 "Свали всичко в пределите на:"
 
-#: ../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} метри"
 
-#: ../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 "Максимална област за една заявка:"
 
-#: ../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} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8152,9 +8278,9 @@
 "Продължаване?</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 "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../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 "
@@ -8164,5 +8290,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../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 "
@@ -8221,37 +8347,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM"
-
-#: ../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} изтрити.)"
-msgstr[1] " ({0} изтрити.)"
-
-#: ../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} се състои от:"
 
-#: ../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 версия: {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 "Преобразувай в слой GPX"
 
-#: ../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."
@@ -8259,5 +8384,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"
@@ -8266,5 +8391,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"
@@ -8272,5 +8397,5 @@
 msgstr[1] "точки"
 
-#: ../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"
@@ -8279,5 +8404,5 @@
 msgstr[1] "следа с {0} точки"
 
-#: ../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"
@@ -8286,5 +8411,5 @@
 msgstr[1] "{0} се състои от {1} следи"
 
-#: ../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"
@@ -8293,9 +8418,9 @@
 msgstr[1] "{0} точки"
 
-#: ../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 маркер"
 
-#: ../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"
@@ -8303,5 +8428,5 @@
 msgstr[1] "маркери"
 
-#: ../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"
@@ -8310,9 +8435,9 @@
 msgstr[1] "{0} се състои от {1} маркери"
 
-#: ../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 "Синхронизиране аудио"
 
-#: ../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."
@@ -8321,5 +8446,5 @@
 "синхронизиращ сигнал."
 
-#: ../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
@@ -8327,14 +8452,14 @@
 msgstr "Аудио синхронизирано на точка {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 "Невъзможно да се синхронизира в слоя, който се изпълнява."
 
-#: ../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 "Установи аудио маркер на позицията на прослушване"
 
-#: ../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 "
@@ -8344,14 +8469,14 @@
 "маркера."
 
-#: ../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 ""
 "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
 
-#: ../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 "Показване/скирване на Текст/Икони"
 
-#: ../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 "Превключване видимостта на маркер текста и икони."
@@ -8420,5 +8545,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 "Моля, изберете ред за редактиране"
@@ -8432,5 +8557,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."
@@ -9134,7 +9259,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Активиране"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9177,12 +9301,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Изтриване на източник от списъка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Редактиране стойността на избрания ключ за всички обекти"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9196,22 +9318,19 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Добавяне на нов етикет"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Затваряне на избраните отворени списъци с промени"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Редактиране избрания източник."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Качване на данни за слой ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
@@ -9852,5 +9971,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}''."
@@ -9877,5 +9996,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}."
@@ -9883,5 +10002,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}"
@@ -9894,5 +10013,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}''."
@@ -10045,5 +10164,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10052,19 +10171,19 @@
 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 ""
@@ -10072,20 +10191,20 @@
 "<relation>."
 
-#: ../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 ""
@@ -10093,19 +10212,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 "Непълна спецификация <member> с 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 "Недопустим обект с 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 ""
@@ -10116,9 +10235,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 ""
@@ -10128,25 +10247,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 ""
@@ -10154,5 +10273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10161,5 +10280,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10167,5 +10286,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10174,13 +10293,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 данните..."
 
-#: ../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 "Подготвяне на базата данни ..."
@@ -10331,9 +10450,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} добавка е успешно свалена. Моля, рестартирайте JOSM."
-msgstr[1] "{0} добавки са успешно свалени. Моля, рестартирайте JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10395,7 +10514,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Обновяване разширения"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10540,35 +10658,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 "неизвестно"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11200,47 +11287,46 @@
 "{0} км/ч"
 
-#: ../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 координати от EXIF"
 
-#: ../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 "Започване на преглед на директории"
 
-#: ../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 "Един от избраните файлове е празен !!!"
-
-#: ../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 "Прочитане на снимки..."
 
-#: ../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 "Невъзможно да се вземе каноничното име на директория {0}\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 "Сканиране на директория {0}"
 
-#: ../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 "Намерен е празен файл в директория {0}\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 "Грешка при четене на файлове от директория {0}\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 "Корелиране към GPX"
 
-#: ../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."
@@ -11256,24 +11342,24 @@
 msgstr "Зареждане набор изображения в нов слой."
 
-#: ../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 Файлове (*.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 "Файлът {0} е зареден вече под името \"{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 "Грешка при разбор {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 "Не може да се прочете \"{0}\""
 
-#: ../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."
@@ -11285,34 +11371,34 @@
 "изберете времева зона<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 "Време на снимката (от 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 време (прочетено от снимката по-горе): "
 
-#: ../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 " [дд/мм/гггг чч:мм:сс]"
 
-#: ../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 "Намирам се в часовата зона: "
 
-#: ../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 "Без дата"
 
-#: ../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 "Отваряне друга снимка"
 
-#: ../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 "Синхронизиране време от снимка на GPS приемник"
 
-#: ../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"
@@ -11322,29 +11408,29 @@
 "Моля използвайте изисквания формат!"
 
-#: ../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 "Невалидна дата"
 
-#: ../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 "<Няма още GPX следи заредени>"
 
-#: ../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 следа: "
 
-#: ../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 "Отвори друга GPX следа"
 
-#: ../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 "Часова зона: "
 
-#: ../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 "Отместване:"
 
-#: ../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 ""
@@ -11352,41 +11438,41 @@
 "помогне?</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 "Обновяване позицията на: "
 
-#: ../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 "Всички изображения"
 
-#: ../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 "Изображението няма EXIF позиция"
 
-#: ../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 "Няма още маркирани изображения"
 
-#: ../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 "Съпоставяне на изображения с GPX следа"
 
-#: ../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 "Корелнутииране"
 
-#: ../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 "Авто-отгатване"
 
-#: ../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 "Трябва да изберете GPX следа"
 
-#: ../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 "Няма избрана GPX следа"
 
-#: ../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 ""
@@ -11397,9 +11483,9 @@
 "Очакван формат: {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 "Невалидна часова зона"
 
-#: ../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 ""
@@ -11410,65 +11496,65 @@
 "Очакван формат: {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 "Невалидно отместване"
 
-#: ../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} съвпадения на {1} в GPX следа {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 Следата е заредена"
 
-#: ../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 "Избраните снимки не съдържат времева информация."
 
-#: ../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 "Снимките не съдържат времева информация"
 
-#: ../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."
 msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
 
-#: ../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 следата няма информация за времето"
 
-#: ../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 "Часови пояс: {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 "Минути: {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 "Секунди: {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} от {1} снимки към GPX следа."
 
-#: ../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 "(Времева разлика от {0} дни)"
 
-#: ../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 "Разминаване между следата и снимките: {0}мин {1}сек"
 
-#: ../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 "
@@ -11476,13 +11562,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 "Съотнасянето на снимки към следа се провали"
 
-#: ../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 "Настройване часови пояс и отместване"
 
-#: ../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 "Стойности по подразбиране"
@@ -11503,5 +11589,5 @@
 msgstr "Грешка във файла {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11514,37 +11600,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 "Грешка при зареждане на файла"
 
-#: ../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 "Ламбертова зона 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 "Ламбертова зона 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 "Ламбертова зона 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 "Ламбертова зона 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: Невалидно url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11556,18 +11642,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 "Избор на комуна"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Избери от..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
@@ -11594,34 +11680,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 "Замени оригиналния фон с фонов цвят от 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 "Обърни сивите цветове (за черни фонове)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Заване на прозрачен фон."
 
-#: ../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 "Обозначване на границите на зона със свалени данни."
 
-#: ../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 "Включване автоматично кеширане."
 
-#: ../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 "Макс. размер на кеша (в 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."
@@ -11639,9 +11725,9 @@
 "данни създадени с това разширение."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "Френски кадастров 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 ""
@@ -11649,10 +11735,10 @@
 "източници е включено</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Източник"
 
-#: ../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 "
@@ -11661,5 +11747,5 @@
 "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM."
 
-#: ../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). "
@@ -11669,76 +11755,76 @@
 "текстове на тъмни фонове."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Позволяване на подреждане в няколко слоя"
 
-#: ../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 ""
 "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно."
 
-#: ../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 "Рисувай правоъгълник около зареденните от WMS сървър данни."
 
 #. 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 "Взимане по-малки изображения (по-високо качество, но повече памет)"
 
-#: ../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 "Фиксирана площ (по подразбиране 100m2)"
 
-#: ../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 "Фиксирана размер (от 25 до 1000 метра)"
 
-#: ../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 ""
 "Най-старите файлове автоматично се изтриват когато този размер се премине"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Източник на автомат.-маркери добавен:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Добавяне на \"source=...\" към ?"
 
-#: ../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}"
 
-#: ../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 "Свързване с WMS Сървър..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Създаване на сгради"
 
-#: ../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"
@@ -11748,30 +11834,30 @@
 "размера на импорта на сгради е ограничен до 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 "Моля, включете авто-източниците и проверете 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..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Екстракт най-добре съвпадаща граница..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Създаване на граница"
 
-#: ../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"
@@ -11779,29 +11865,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 "Екстракт граница на комуна"
 
-#: ../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 "Само на векторни слоеве"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Екстракт на белезите на сграда"
 
-#: ../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 "Зареждане на изображение от френски кадастърен WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Кадастър: {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"
@@ -11810,13 +11896,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"
@@ -11824,5 +11910,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"
@@ -11830,14 +11916,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"
@@ -11845,14 +11931,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"
@@ -11860,64 +11946,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 "Зона"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Ламбертова зона"
 
-#: ../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 "Зареждане на местоположението от кеша (само ако той е включен)"
 
-#: ../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 "Промяна местоположение"
 
-#: ../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 "Посочете ново местоположения за следващата заявка"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Добавяне на нов слой"
 
-#: ../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 "Местоположение"
 
-#: ../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 "
@@ -11927,25 +12013,25 @@
 "пунктуацията известни от  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 "Добавяне на нов слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Нулиране на cookie"
 
-#: ../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 "Взимане ново cookie (изтичане на сесията)"
 
-#: ../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 "Експортирай във формат PNG (само растерни изображения)"
 
-#: ../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
@@ -11955,14 +12041,14 @@
 msgstr[1] "Опростяване на път (премахнати {0} точки)"
 
-#: ../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"
 
-#: ../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"
@@ -11970,5 +12056,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
@@ -11976,5 +12062,5 @@
 msgstr "Сваляне на WMS квадранти от {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"
@@ -11984,34 +12070,34 @@
 "един от тях първо, после опитайте отново."
 
-#: ../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 "Празен слой"
 
-#: ../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 слой ({0}), {1} квадрант(и) зареден(и)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Не е векоторизиран."
 
-#: ../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 "Размер на растера: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Векторизиран."
 
-#: ../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 "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12022,18 +12108,18 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
-#: ../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 "Грешка в кеширането на Ламбертовата зона"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12142,9 +12228,9 @@
 msgstr "Създаване на копие на път"
 
-#: ../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 "Слой за редактиране на GPX следи"
 
-#: ../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 "Преобразуване към GPX слой с анонимно време"
@@ -12161,11 +12247,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 "Импортиране на път от GPX слой"
 
 #: ../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 "Височина на съществуващ път"
@@ -12175,5 +12261,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 "Не е открит слой с GPX данни."
@@ -12386,5 +12472,5 @@
 msgstr "Показване на не-геомаркирани фотографии"
 
-#: ../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 "Импортирани изображения"
@@ -12821,5 +12907,5 @@
 msgstr "Ъгъл между две избрани точки"
 
-#: ../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 "Слой за провеждане на измервания"
@@ -12898,5 +12984,5 @@
 msgstr "Цикъл на сваляне от 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"
@@ -13039,7 +13125,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Слой / Ниво"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13210,43 +13295,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 "Интерактивна карта"
 
-#: ../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 "Авто мащаб: "
-
-#: ../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 "Зареждане на квадрант"
 
-#: ../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 "Показване на информация"
-
-#: ../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 "Зареждане на всички квадранти"
 
-#: ../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 "Увеличаване на мащаба"
 
-#: ../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 "Намаляне на мащаба"
 
-#: ../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 "изображение "
@@ -13282,7 +13365,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Макс.мащаб ниво: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13641,6 +13723,6 @@
 msgstr "Сигурни ли сте?"
 
-#: ../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
@@ -13648,5 +13730,5 @@
 msgstr "Грешки при проверка"
 
-#: ../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 "Няма грешки при проверката"
@@ -13737,5 +13819,5 @@
 msgstr "друго при проверка"
 
-#: ../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}"
@@ -13835,7 +13917,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Неподредени брегови линии"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13867,18 +13948,18 @@
 msgstr "Пресичащи се пътища"
 
-#: ../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 "Повтарящи се точки"
 
-#: ../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 "Този тест проверява за точки, които се намират на едно и също място."
 
-#: ../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 "Потвърждение"
@@ -14040,80 +14121,80 @@
 #. 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 "Проблем с изобразяването"
 
-#: ../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 "Неправилен ключ ''{0}''."
 
-#: ../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 "Маркери с празни стойности"
 
-#: ../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 "Неправилен параметров ключ"
 
-#: ../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 "Неправилен интервал в ключ"
 
-#: ../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 "Стойност на параметър започва или завършва с интервал"
 
-#: ../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 "Стойности съдържащи HTML елементи"
 
-#: ../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 "Ключ ''{0}'' не е намерен в шаблони."
 
-#: ../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 "Шаблоните не съдържат такъв ключ"
 
-#: ../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 "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните."
 
-#: ../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 "Шаблоните не съдържат стойност"
 
-#: ../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 "ЗА ПОПРАВКА"
 
-#: ../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 "Проверка на ключовете."
 
-#: ../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 "Проверяване за валидни ключове и сравняване със списък от думи."
 
-#: ../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 "Използване на сложен параметров тест."
 
-#: ../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 "Проверяване стойностите и маркерите използвайки по-сложни правила."
 
-#: ../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 "Източници за TagChecker"
 
-#: ../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."
@@ -14124,87 +14205,87 @@
 "маркирането."
 
-#: ../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 "Добавяне нов източник в списъка."
 
-#: ../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 "Редактиране избрания източник."
 
-#: ../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 "Изтриване на източник от списъка"
 
-#: ../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 "Източници на данни"
 
-#: ../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 "Проверка стойностите."
 
-#: ../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 "Проверяване дали стойностите са правилни спрямо шаблони."
 
-#: ../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 "Проверка за маркерни \"ЗА ПОПРАВКА\""
 
-#: ../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 "Търси точки или пътища с \"FIXME\" в някой стойност на ключ."
 
-#: ../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 "Проверка за бележки при рисуване."
 
-#: ../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 "Проверява дали картата при русиване е открила грешки в данните."
 
-#: ../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 "Използване на файл с данни по подразбиране."
 
-#: ../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 "Използване на файла с данни по подразбиране (препоръчвано)."
 
-#: ../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 "Използване на файла за проверка на правопис по подразбиране."
 
-#: ../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 ""
 "Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
 
-#: ../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 "Поправи параметрите"
 
-#: ../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 "Не може да бъде открит типа на елемента"
 
-#: ../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 "Не може да бъде открито нивото на предупрежение"
 
-#: ../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 "Неправилен израз ''{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}''"
@@ -14379,17 +14460,17 @@
 msgstr "Този тест проверява дали път има крайна точка близо до друг път."
 
-#: ../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 "Края на път близо до друг път/магистрала"
 
-#: ../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 "Края на път близо до друг път/линия"
 
-#: ../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 "Възел близо до друг път"
 
-#: ../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 "Свързан край на път е близо до друг път"
@@ -14442,13 +14523,13 @@
 msgstr "Този тест проверява за посоката на вода, земя или брегови линии."
 
-#: ../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 "Обърната брегова линия: земята не е отляво"
 
-#: ../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 "Обърната посока на границата на водоем: земята не е от ляво"
 
-#: ../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 "Обърната посока на линията на сушата: земята не е от ляво"
@@ -14484,7 +14565,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 слой ({0}), сваляне в мащаб {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14492,18 +14573,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 "Сваляне"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Сваляне на картографски данни от OSM сървър."
+
+#: ../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>Няма слоеве към които слоя източник<br>''{0}''.<br>би могъл да се "
+"обедини.</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 "Изтриване на повтарящи се точки..."
+
+#: ../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 ""
 
@@ -14511,43 +14636,4 @@
 msgid "Exception occurred"
 msgstr "Възникна грешка"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "помощ"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Помощ / За модула"
-
-#: ../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"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14651,28 +14737,28 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Автоматично сваляне"
 
-#: ../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 слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../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 слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14687,13 +14773,13 @@
 "WMS въпреки всичко?"
 
-#: ../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 "Невалиден URL?"
 
-#: ../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"
@@ -14702,42 +14788,42 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../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 слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../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 "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
@@ -19199,14 +19285,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Архиологични разкопки"
+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 "Редактирай архиологични разкопки"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -21212,14 +21296,14 @@
 #: build/trans_presets.java:2423
 msgid "Line type"
-msgstr ""
+msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2423
 msgid "line"
-msgstr ""
+msgstr "линия"
 
 #: build/trans_presets.java:2423
 msgid "minor_line"
-msgstr ""
+msgstr "второстепенна линия"
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -21485,5 +21569,5 @@
 #: build/trans_presets.java:2476
 msgid "gray"
-msgstr ""
+msgstr "сиво"
 
 #: build/trans_presets.java:2476
@@ -22968,5 +23052,5 @@
 #: build/trans_presets.java:3194
 msgid "Route state"
-msgstr ""
+msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
@@ -27082,5 +27166,5 @@
 #: build/trans_validator.java:73
 msgid "relation without type"
-msgstr "връзка без тип"
+msgstr "релацията няма тип"
 
 #. relation : E : type != *
@@ -27175,62 +27259,87 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "File could not be found."
-#~ msgstr "Файлът не може да бъде намерен."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Моля изберете поне един тип данни за сваляне."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Качването към OSM API пропадна."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Конфликтиращи релации"
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Не може да се търси защото няма заредени данни"
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Няма примитив с версия {0} в тази история"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Няма валидна версия от дата ''{0}'' в тази история"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "няма намерена по-ранна версия. Историята е празна."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "няма намерена последна версия. Историята е празна."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Не е намерен примитив с id = {0} в тази база данни"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Достигнат е краят на реда"
+
+#~ msgid "help"
+#~ msgstr "помощ"
+
+#~ msgid "Help / About"
+#~ msgstr "Помощ / За модула"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Помощ за модула WMS"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} Разширението успешно обновено. Моля рестартирайте JOSM."
+#~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM."
 
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
 #~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
-#~ "го изтрием ли от релацията?</html>"
+#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично."
 
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
 #~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
-#~ "ли от релацията?</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Грешка при разбор"
-
-#~ msgid "File not found"
-#~ msgstr "Файлът не е намерен"
-
-#~ msgid "Replace"
-#~ msgstr "Замяна"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Моля, въведете първо желаните координати."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Изберете първо отметка"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Моля задайте низ за търсене"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Не могат да се получат резултати от търсене от сървъра"
-
-#~ msgid "name"
-#~ msgstr "име"
-
-#~ msgid "zoom"
-#~ msgstr "мащаб"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Копиране на подразбиращите се"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Моля изберете ред за копиране."
+#~ "Сървърът върна във вътрешна грешка. Опитайте да намалите областта или "
+#~ "повторете опита си по-късно."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни"
+
+#~ msgid "Commit comment"
+#~ msgstr "Коментар на съхранението"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Сървъра не поддържа управление на версиите"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
+
+#~ msgid "Unknown version"
+#~ msgstr "Неизвестна версия"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Намерен е елемент <nd> извън път."
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "към <nd> няма обръщения ref."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Открит е маркер <member> извън релация."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Неправилен код на точка"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
 
 #~ msgid ""
@@ -27242,70 +27351,4 @@
 #~ "warntime'.)"
 
-#~ msgid "Show Tile Status"
-#~ msgstr "Показване статуса на квадрант"
-
-#~ msgid "Request Update"
-#~ msgstr "Изискване на обновяване"
-
-#~ msgid "error loading metadata"
-#~ msgstr "грешка при зареждане на метаданните"
-
-#~ msgid "requested: {0}"
-#~ msgstr "изискани: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "грешка при изискване на обновяване"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Разширението успешно обновено. Моля рестартирайте JOSM."
-#~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Сървърът върна във вътрешна грешка. Опитайте да намалите областта или "
-#~ "повторете опита си по-късно."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни"
-
-#~ msgid "Commit comment"
-#~ msgstr "Коментар на съхранението"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Сървъра не поддържа управление на версиите"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестна версия"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Намерен е елемент <nd> извън път."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "към <nd> няма обръщения ref."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Открит е маркер <member> извън релация."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Неправилен код на точка"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
-
 #~ msgid "Unsaved Changes"
 #~ msgstr "Незаписани промени"
@@ -27338,4 +27381,10 @@
 #~ msgstr "Преместване"
 
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Моля, въведете първо желаните координати."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Изберете първо отметка"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране."
@@ -27368,6 +27417,12 @@
 #~ msgstr "Конфликти: {0}"
 
+#~ msgid "name"
+#~ msgstr "име"
+
 #~ msgid "OSM username (email)"
 #~ msgstr "OSM потребителско име (email)"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Грешка при разбор"
 
 #~ msgid "their version:"
@@ -27385,6 +27440,12 @@
 #~ msgstr "моя версия:"
 
+#~ msgid "File not found"
+#~ msgstr "Файлът не е намерен"
+
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Изтриване {1} {0}"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Конфликтиращи релации"
 
 #~ msgid "JOSM Online Help"
@@ -27506,4 +27567,7 @@
 #~ msgstr "Копирай стойностите по подразбиране"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Моля изберете ред за копиране."
+
 #~ msgid "Metacarta Map Rectifier image id"
 #~ msgstr "Metacarta Map Rectifier image id"
@@ -27538,4 +27602,10 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "Показване на панела автори"
+
+#~ msgid "zoom"
+#~ msgstr "мащаб"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Моля задайте низ за търсене"
 
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
@@ -27667,4 +27737,7 @@
 #~ msgstr "Всички линии бяха празни"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Моля изберете поне един тип данни за сваляне."
+
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Обединяване точки от различни релации?"
@@ -27727,4 +27800,19 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Импортиране на TCX Файл..."
+
+#~ msgid "Request Update"
+#~ msgstr "Изискване на обновяване"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Показване статуса на квадрант"
+
+#~ msgid "requested: {0}"
+#~ msgstr "изискани: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "грешка при изискване на обновяване"
+
+#~ msgid "error loading metadata"
+#~ msgstr "грешка при зареждане на метаданните"
 
 #~ msgid "Validate"
@@ -27920,4 +28008,7 @@
 #~ msgstr "Обновява текущо избраните примитиви от сървъра."
 
+#~ msgid "File could not be found."
+#~ msgstr "Файлът не може да бъде намерен."
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -27946,4 +28037,7 @@
 #~ "Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон "
 #~ "\"{1}\""
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Качването към OSM API пропадна."
 
 #~ msgid "Primitive already deleted"
@@ -27981,4 +28075,7 @@
 #~ msgstr "премахване на справка от път {0}"
 
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Не могат да се получат резултати от търсене от сървъра"
+
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "параметърът '{0}' не трябва да е празен"
@@ -27989,4 +28086,7 @@
 #~ msgid "Delete all"
 #~ msgstr "Изтриване на всички"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Копиране на подразбиращите се"
 
 #~ msgid "Do you really want to delete layer ''{0}''?"
@@ -28033,4 +28133,18 @@
 #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
+#~ "ли от релацията?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
+#~ "го изтрием ли от релацията?</html>"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
@@ -28063,2 +28177,5 @@
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Показване историята на избрания примитив"
+
+#~ msgid "Replace"
+#~ msgstr "Замяна"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 18508)
+++ applications/editors/josm/i18n/po/cs.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-07 21:42+0000\n"
-"Last-Translator: Martin Petricek <singularita@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-13 19:43+0000\n"
+"Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:06+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 "Chyba"
@@ -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"
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -457,5 +458,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
@@ -497,5 +498,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
@@ -504,6 +505,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"
@@ -688,5 +690,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
@@ -699,5 +701,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"
@@ -769,5 +771,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
@@ -775,28 +785,28 @@
 msgstr "Parametr ''{0}'' nesmí být null"
 
-#: ../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 "Došlo k  {0} konfliktům během importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikty během stahování"
 
-#: ../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 "({0}/{1}) Nahrávám rodiče uzlu {2}"
 
-#: ../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 "({0}/{1}) Nahrávám rodiče cesty {2}"
 
-#: ../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}"
@@ -833,10 +843,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 "Exportovat do 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 "Exportovat data do GPX souboru."
@@ -849,11 +859,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
@@ -884,5 +893,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
@@ -897,17 +905,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
@@ -969,5 +978,5 @@
 msgstr "Napojit bod na nejbližší část cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Spojit uzly a linie"
@@ -998,20 +1007,19 @@
 msgstr "Zvolte minimálně dva uzly ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Přerušuji..."
-
-#: ../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 "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1152,7 +1160,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Stahuji data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1301,10 +1308,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 "Uložit"
 
 #: ../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 "Uložit aktuální data."
@@ -1361,10 +1368,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 "Uložit jako..."
 
 #: ../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 "Uložit aktuální data do nového souboru"
@@ -1408,25 +1415,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 "Zavřít"
 
-#: ../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 "Rozdělit cestu"
 
-#: ../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 "Rozdělit cestu zvoleným uzlem"
 
-#: ../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 "Tento výběr nemůže být použit k rozdělení."
 
-#: ../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."
@@ -1435,5 +1442,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../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 "
@@ -1446,9 +1453,9 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../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 "Zvolené uzly nesdílejí stejnou cestu."
 
-#: ../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."
@@ -1457,10 +1464,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../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 "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../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 "
@@ -1470,5 +1477,5 @@
 "cesty.)"
 
-#: ../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 "
@@ -1479,5 +1486,5 @@
 "html>"
 
-#: ../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 "
@@ -1487,5 +1494,5 @@
 "být ověřeno, zda je zkopírování správné a případně opraveno.</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"
@@ -1515,38 +1522,38 @@
 msgstr "Zduplikovat uzly používané více cestami."
 
-#: ../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 "Tento uzel není přilepen k ničemu jinému."
 
-#: ../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 "Žádný z těchto uzlů není připojen na něco jiného."
 
-#: ../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 "Žádný z uzlů v této cestě není připojen na něco jiného."
 
-#: ../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 "Tento výběr nelze použít pro oddělení uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden otagovaný uzel, nebo"
 
-#: ../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 "* Jeden uzel používaný více než jednou cestou, nebo"
 
-#: ../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 ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
 
-#: ../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"
@@ -1555,5 +1562,5 @@
 "nebo"
 
-#: ../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."
@@ -1562,5 +1569,5 @@
 "cestě."
 
-#: ../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"
@@ -1573,9 +1580,9 @@
 "své vlastní kopie a všechny uzly budou vybrány."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nespojený uzel"
 
-#: ../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"
@@ -1583,5 +1590,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"
@@ -1622,12 +1629,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Nahrát veškeré změny v aktuální datové sadě na OSM 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 "Stahuji data"
@@ -1643,5 +1649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Aktualizovat vybrané"
 
@@ -1656,5 +1663,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
 
@@ -1662,4 +1670,9 @@
 msgid "Selection empty"
 msgstr "Prázdný výběr"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Smazat objekty"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1669,7 +1682,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 "Nahrát veškeré změny v aktuální datové sadě na OSM server"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1810,29 +1822,26 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a "
-"opakuji přenos."
+"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a "
+"opakuji nahrávání."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
-"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a "
-"opakuji přenos."
+msgstr "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Nahrávám data na serevr ..."
+msgstr "Nahrávám {0} objektů ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1949,9 +1958,9 @@
 msgstr "Stažená GPX data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Stahuji data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1960,5 +1969,5 @@
 "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
 
-#: ../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 "V této oblasti nebyla nalezena žádná data."
@@ -1974,7 +1983,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "viditelný (na serveru)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1990,7 +1998,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Zrušit nahrávání na server a pokračovat v editaci"
+msgstr "Klikněte pro zrušení a návrat k editaci"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2014,7 +2021,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
+msgstr "Během hromadného stahování došlo k následujícím chybám: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2024,7 +2031,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Chyby při stahování"
+msgstr "Chyby během stahování"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2038,5 +2044,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
@@ -2069,6 +2075,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 "vybráno"
@@ -2086,26 +2092,26 @@
 msgstr "Přidat uzel do cesty"
 
-#: ../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 "Spojit existující cestu do uzlu"
 
-#: ../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 "Přidat nový uzel do již existující cesty"
 
-#: ../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 "Přidat uzel do cesty a spojit"
 
-#: ../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 "Vytvořit nový uzel."
 
-#: ../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 "Vybrat uzel pod kurzorem."
 
-#: ../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."
@@ -2115,46 +2121,44 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../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 "Začít novou cestu od posledního uzlu."
 
-#: ../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 "Pokračovat v cestě od posledního uzlu."
 
-#: ../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 "Dokončit kreslení"
 
-#: ../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 "Vytlačit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Vytvořit plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Vytáhnout cestu"
 
-#: ../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 "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Nakreslete obdélník požadované velikosti a pak pusťte myší tlačítko."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Nakreslete obdélník požadované velikosti a pak pusťte myší tlačítko."
 
-#: ../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 "Pusťte myší tlačítko k zastavení otaáčení"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Táhni segmentem cesty a vytvoř obdelník."
 
@@ -2213,4 +2217,8 @@
 msgstr "Vždy přesunout a tento dialog již více nezobrazovat"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2218,4 +2226,8 @@
 msgstr ""
 "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Pusťte myší tlačítko k zastavení otaáčení"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2245,69 +2257,72 @@
 "nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši"
 
-#: ../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 "Hledat..."
 
-#: ../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 "Hledat objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
-
-#: ../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 "Prosím zadejte řetězec filtru"
 
-#: ../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 "Zadjte hledaný řetězec."
 
-#: ../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 "regulární výraz"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "nahradit označené"
 
-#: ../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 "přidat k výběru"
 
-#: ../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 "odebrat z výběru"
 
-#: ../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 "Najít ve výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "velikost písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regulární výraz"
 
-#: ../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>Baker Street</b> - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' v jakémkoliv klíči nebo jménu."
 
-#: ../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:Bak</b> - 'Bak' kdekoliv ve jménu."
 
-#: ../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> - klíč 'type' s hodnotou přesně '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>, "
@@ -2317,57 +2332,56 @@
 "<b>*=value</b>, <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:Bak</b> - neobsahuje 'Bak' ve jménu."
 
-#: ../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> - klíč 'foot' nastavený na jakoukoliv hodnotu."
 
-#: ../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>Speciální cíle:</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> - typ objektu (<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>user:</b>... - všechny objekty změněné uživatelem"
 
-#: ../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 "<b>id:</b>... - objekt s daným ID (0 pro nové objekty)"
 
-#: ../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>... - objekt s daným počtem uzlů"
 
-#: ../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>... - objekt s daným počtem uzlů"
-
-#: ../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> - všechny změněné objekty"
 
-#: ../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> - všechny vybrané objekty"
 
-#: ../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> - všechny nekompletní objekty"
 
-#: ../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>untagged</b> - všechny objekty bez 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"
@@ -2375,5 +2389,5 @@
 "<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
 
-#: ../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"
@@ -2381,18 +2395,18 @@
 "<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
 
-#: ../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 "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
 
-#: ../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 ""
 "Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
 
-#: ../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 "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
 
-#: ../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
@@ -2402,51 +2416,51 @@
 msgstr "Filtrovat"
 
-#: ../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 "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Přidat filtr"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Začít hledání"
 
-#: ../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 "Nebyly nalezeny záznamy pro \"{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 "Nic nebylo přidáno výběrem hledáním \"{0}\""
 
-#: ../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 "Nic nebylo odstraněno výběrem hledáním \"{0}\""
 
-#: ../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 "Ve výběru se nenašlo nic při hledání ''{0}''"
 
-#: ../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 "Nalezeno {0} odpovídajích výrazů"
 
-#: ../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"
@@ -2495,16 +2509,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Chybný počet parametrů pro operátor nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah "
-"čísel, například nodes:10-20."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2626,6 +2637,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
@@ -2753,5 +2764,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 ""
@@ -2772,9 +2783,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 "parametr ''{0}'' nesmí být prázdný"
+msgstr "Parametr ''{0}'' nesmí být prázdný"
 
 #: ../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"
@@ -2814,5 +2828,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 "Rozdělit segment cesty"
@@ -2820,6 +2834,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."
@@ -2831,5 +2845,5 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -2840,5 +2854,15 @@
 msgstr "Vyřešení konfliktu ve stavu smazání pro {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"
@@ -2924,5 +2948,5 @@
 msgstr "Vyřešení {0} konfliktů tagů v relaci {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3029,8 +3053,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 "Výchozí hodnota je''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3111,5 +3141,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3155,9 +3185,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
 msgstr ""
-"Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. Výjimka: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3171,8 +3199,9 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Varování: neočekávané číslo verze JOSM v souboru revizí, hodnota je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Varování: soubor revizí ''/REVISION'' chybí."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
@@ -3216,5 +3245,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
@@ -3226,7 +3255,7 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it's already included"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3235,4 +3264,43 @@
 "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 "Chybějící argument pro \"NOT\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Historie pro relaci {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší "
+"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj "
+"prvek. "
 
 #. translators notes must be in front
@@ -3289,33 +3357,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Chyba: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varování: {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 "očekáváno id >= 0. Nalezeno {0}"
 
-#: ../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 "objekt s id=0 nemůže být neviditelný"
 
-#: ../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 "očekáváno id > 0. Nalezeno {0}"
 
-#: ../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 "očekávána verze > 0. Nalezena {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3339,45 +3408,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 "nelze přidat uzel {0} do nekompletní cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "V historii není žádný prvek s verzí {0}"
-
-#: ../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 "V historii není žádná verze platná k datu ''{0}''"
-
-#: ../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 "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "nenalezena starší verze. Historie je prázdná."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "nenalezena novější verze. Historie je prázdná."
-
-#: ../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 "V této datové sadě nelze nalézt prvek s id {0}"
-
-#: ../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 "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}"
-
-#: ../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
@@ -3388,6 +3440,7 @@
 msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
 
@@ -3398,148 +3451,145 @@
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
-#: ../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 "Cesta se stylem plochy není uzavřená."
 
-#: ../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 "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../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 "Odstraněn prvek ''{0}'' z relace."
 
-#: ../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 "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../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 "Nalezena více než jedna \"from\" cesta."
 
-#: ../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 "Nalezeno více cílových \"to\" cest."
 
-#: ../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 "Nalezen více než jeden \"via\"."
 
-#: ../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 "Neznámá role ''{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 "Neznámý typ prvku pro ''{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 "Nenazezena příchozí cesta \"from\"."
 
-#: ../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 "Nenalezena odchozí cesta \"to\"."
 
-#: ../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 "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../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 "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../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 "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../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 "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../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 "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../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 "Styl pro omezení {0} nenalezen."
 
-#: ../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 "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#: ../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 "Vnitřní cesta ''{0}'' je venku."
 
-#: ../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 "Žádná použitelná role ''{0}'' pro cestu ''{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 "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../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 "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../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 "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#: ../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 "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../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 "nepopsaný"
 
-#: ../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 "text"
 
-#: ../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 ""
-"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší "
-"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj "
-"prvek. "
-
-#: ../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 "Chyba: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varování: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "neaktivní"
 
-#: ../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
@@ -3550,5 +3600,5 @@
 msgstr[2] "uzly"
 
-#: ../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
@@ -3559,6 +3609,6 @@
 msgstr[2] "cestami"
 
-#: ../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
@@ -3569,13 +3619,13 @@
 msgstr[2] "relace"
 
-#: ../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 "nepopsaná cesta"
 
-#: ../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 "nekompletní cesta"
 
-#: ../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
@@ -3583,5 +3633,5 @@
 msgstr "pozadí"
 
-#: ../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 "zvýraznit"
@@ -3666,5 +3716,5 @@
 msgstr "Znovu nezobrazovat"
 
-#: ../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
@@ -3672,32 +3722,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 "nekompletní"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "silnice"
 
-#: ../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 "železnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vodní tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
-#: ../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"
@@ -3707,5 +3757,5 @@
 msgstr[2] "{0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3715,33 +3765,33 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Porušení předpokladů"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Bezpečnostní vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Síťová vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "IO výjimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Interní chyba serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Špatný požadavek"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Nenalezeno"
 
-#: ../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
@@ -3749,9 +3799,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Neznámé jméno počítače"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Objekt smazán"
@@ -3773,7 +3823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Zavřít dialog"
+msgstr "Klikněte pro zavření dialogu"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3975,5 +4024,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 "Upravit"
@@ -4099,10 +4148,10 @@
 msgstr "Uživatel:"
 
-#: ../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 "vrstva není v seznamu"
 
-#: ../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"
@@ -4110,7 +4159,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Ne, zruš operaci"
+msgstr "Klikněte pro zrušení aktuální operace"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4141,4 +4189,6 @@
 "relation</strong>.</html>"
 msgstr ""
+"<html>Prosím potvrďte odstranění <strong>1 objektu</strong> z <strong>1 "
+"relace</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
@@ -4149,4 +4199,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Prosím potvrďte odstranění <strong>1 objektu</strong> z <strong>{0} "
+"relací</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
@@ -4156,4 +4208,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Prosím potvrďte odstranění <strong>{0} objektů</strong> z <strong>{1} "
+"relací</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
@@ -4233,5 +4287,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"
@@ -4240,5 +4294,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"
@@ -4248,5 +4302,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 "Členové"
@@ -4697,5 +4751,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 "Ne, zrušit"
@@ -4755,6 +4809,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 "<nedefinováno>"
@@ -4857,7 +4909,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Konflikty při slučování uzlů - zkombinovaný uzel je ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -4883,4 +4935,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"
@@ -4978,5 +5031,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"
@@ -4988,5 +5041,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"
@@ -5007,10 +5060,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep"
-msgstr ""
+msgstr "Ponechat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Odstranit tohoto člena z relace"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5029,12 +5081,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Nastaví roli pro vybrané členy"
+msgstr "Zadat roli všech členů relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Tagy z relací"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5050,7 +5100,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5117,5 +5166,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
@@ -5211,5 +5260,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"
@@ -5265,11 +5314,11 @@
 msgstr "Zobrazit historii všech zobrazených objektů"
 
-#: ../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 "Objekt s historií"
 
-#: ../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
@@ -5277,13 +5326,13 @@
 msgstr "Znovu načíst"
 
-#: ../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 "Znovu nahrát vybrané objekty a obnovit seznam."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../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 "Zobrazit historii vybraných objektů."
@@ -5340,7 +5389,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] "Toto změní až  {0} objekt."
@@ -5349,5 +5397,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 "Prázdná hodnota smaže klíč"
 
@@ -5373,4 +5422,12 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
+#: ../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] "Toto změní až  {0} objekt."
+msgstr[1] "Toto změní až  {0} objekty."
+msgstr[2] "Toto změní až  {0} objektů."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5447,60 +5504,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 "Relace"
 
-#: ../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 "Otevřít seznam všech relací"
 
-#: ../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 "Relace: {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 "Otevřít editor pro zvolenou relaci"
 
-#: ../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 "Smazat vybrané relace"
 
-#: ../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 "Vytvořit novou relaci"
 
-#: ../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 "Vytvořit kopii relace a otevřít ji v novém okně"
 
-#: ../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 "Nastavit aktuální výběr na seznam vybraných relací"
 
-#: ../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 "Smazat vybrané relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
-#, fuzzy
+msgstr "Vybrat členy všech vybraných relací"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
 msgid "Select members"
-msgstr "Vyberte buď:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
-#, fuzzy
+msgstr "Vybrat členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
-msgstr "Stáhnout vybrané relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
-#, fuzzy
+msgstr "Stáhnout všechny členy vybraných relací"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
-msgstr "Stáhnout prvky"
+msgstr "Stáhnout členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5661,5 +5714,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}"
@@ -5914,18 +5967,19 @@
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
 
-#: ../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 "Zvětšit na"
 
-#: ../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"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
 msgstr "Zvětšit na prvek odkazovaný prvním členem výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací"
 
-#: ../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 "Zvětšování je neaktivní protože nebyl vybrán žádný člen"
@@ -5948,5 +6002,5 @@
 msgstr "očekáváno child.getId() >0. Nalezeno {1}"
 
-#: ../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}"
@@ -6017,7 +6071,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Aktuálně není otevřena žádná sada změn."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6029,12 +6082,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Vytvořit hranice"
+msgstr "Vytvořit záložku"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Upravit vybranou relaci"
+msgstr "Přidat záložku pro aktuální výběr stahované oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6042,10 +6093,10 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"Aktuálně nemáte vybránu oblast pro stažení. Nejdříve prosím nějakou vyberte."
 
 #: ../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 "Prosím zadejte jméno umístění"
+msgstr "Zadejte prosím název záložky stahované oblasti."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6055,12 +6106,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Přesunout zvolené členy nahoru"
+msgstr "Odstranit vybrané záložky"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Přesunout zvolené členy nahoru"
+msgstr "Přejmenovat vybranou záložku"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6098,13 +6147,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Hodnota zeměpisné šířky musí být v rozmezí [-90,90]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Hodnota zeměpisné délky musí být v rozmezí [-180,180]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "Vložit URL ze schránky"
 
 #. adding the download tasks
@@ -6118,7 +6167,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Rozdělit cestu zvoleným uzlem"
+msgstr "Vybrat ke stažení dat z OSM ve vybrané oblasti."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6127,7 +6175,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Označená cesta neobsahuje vybraný uzel."
+msgstr "Vybrat pro stažení GPS tras ve vybrané oblasti."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6140,4 +6187,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Vybrat pro stažení dat do nové vrstvy.<br>Jinak jsou data stažena do "
+"aktivní vrstvy.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -6151,7 +6200,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Nevybrána žádná relace"
+msgstr "Ještě není vybrána oblast"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6164,17 +6212,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů"
+msgstr "Klikněte pro zavření dialogu a zrušení stahování"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Upravit vybranou relaci"
+msgstr "Klikněte pro stažení právě vybrané oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Zvolte řádek k editaci"
+msgstr "Prosím vyberte nejprve oblast stahování."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6190,11 +6235,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Zadej jméno místa které chceš najít:"
+msgstr "Zadejte název hledaného místa"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Oblasti v okolí míst"
 
 #. SAXException does not chain correctly
@@ -6204,20 +6248,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Hledat..."
+msgstr "Hledat ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Směr hledání země"
+msgstr "Klikněte pro zahájení hledání míst"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
 msgid "Querying name server"
-msgstr ""
+msgstr "Dotazuji se jmeného serveru"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Dotazuji se jmeného serveru ..."
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7139,7 +7181,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "poblíž"
+msgstr "Blízko"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7149,4 +7190,7 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
+"<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:</"
+"b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. <b>Výběr:</"
+"b> Držet pravá tlačítko myši a nakreslit rámeček."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
@@ -7184,5 +7228,5 @@
 msgstr "JOSM prohlížeč nápovědy"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7195,6 +7239,12 @@
 "p></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+"<html><p class=\"warning-header\">Nápověda k tomuto tématu chybí</p><p class="
+"\"warning-body\">Nápověda k tématu <strong>{0}</strong> není aktuálně "
+"dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro angličtinu."
+"<br><br>Prosím pomozte vylepšit nápovědu pro JOSM a doplňte chybějící "
+"informace. Editovat můžete začít <a href=\"{2}\">obsah ve vašem lokálním "
+"jazyce ({1})</a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
 #, java-format
 msgid ""
@@ -7204,6 +7254,9 @@
 "p></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+"<html><p class=\"error-header\">Při získávání nápovědy došlo k chybě</p><p "
+"class=\"error-body\">Obsah nápovědy k tématu <strong>{0}</strong> se "
+"nepodařilo získat. Chybové hlášení (nepřeloženo):<br><tt>{1}</tt></p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
 #, java-format
 msgid ""
@@ -7211,20 +7264,23 @@
 "network problem, please check your<br>your internet connection</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+"<html>Nezdařilo se otevřít stránku nápovědy na url {0}.<br>Toto bývá "
+"nejčastěji síťový problém, prosím prověřte<br>vaší internetovou přípojku</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318
 msgid "Failed to open URL"
 msgstr "Nepodařilo se otevřít URL"
 
 #. 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 "Otevřít aktuální stránku nápovědy v externím prohlížeči"
 
 #. 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 "Upravit aktuální stránku nápovědy"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7232,34 +7288,36 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
+"<html>Aktuální URL <tt>{0}</tt><br>je externí adresa. Upravovat je možné "
+"pouze témata umístěná<br>na serveru <tt>{1}</tt>.</html>"
 
 #. 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 "Znovu načíst aktuální stránku nápovědy"
 
 #. 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 "Přejít na předchozí stránku"
 
 #. 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 "Přejít na následující stránku"
 
 #. 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 "Jít na domovskou stránku nápovědy pro JOSM"
 
-#: ../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 "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné."
 
-#: ../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 "Nepodařilo se otevřít stránku s nápovědou."
@@ -7281,37 +7339,37 @@
 msgstr "Zeměpisná délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr "Koordináty"
 
-#: ../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 "Historie pro uzel {0}"
 
-#: ../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 "Historie pro cestu {0}"
 
-#: ../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 "Historie pro relaci {0}"
 
-#: ../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 "Zavřít dialog"
 
-#: ../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 "Znovu nahrát historii ze serveru"
 
-#: ../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 ""
@@ -7319,5 +7377,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 ""
@@ -7325,9 +7383,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 ""
@@ -7336,24 +7394,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 "Nahrát hostorii"
 
-#: ../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 "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
 
-#: ../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 "Nahrávám historii pro uzel {0}"
 
-#: ../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 "Nahrávám historii pro cestu {0}"
 
-#: ../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}"
@@ -7366,4 +7434,22 @@
 msgstr "Bod {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Přiblížit na problém"
+
+#: ../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 "Nahrát hostorii"
+
+#: ../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
@@ -7376,17 +7462,67 @@
 msgstr "Relace {0}"
 
-#: ../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 "Setřídit nabídku s přednastaveními"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Uživatel"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr "Sada změn"
 
-#: ../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 "neznámý"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr "<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
+
+#: ../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 "<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "<anonym>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7411,4 +7547,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "smazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
 
@@ -7644,8 +7795,10 @@
 "cancelled or has failed.</html>"
 msgstr ""
+"<html>Nahrávání a/nebo ukládání některé z vrstev s úpravami<br>bylo zrušeno "
+"nebo selhalo.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Nekompletní nahrávání a/nebo ukládání"
 
 #. item "Highways/Streets/Motorway" text "Name"
@@ -7760,10 +7913,10 @@
 
 #: ../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] "{0} upravený objekt:"
-msgstr[1] "{0} upravené objekty:"
-msgstr[2] "{0} upravených objektů:"
+msgstr[0] "{0} objekt k úpravě:"
+msgstr[1] "{0} objekty k úpravě:"
+msgstr[2] "{0} objektů k úpravě:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7785,9 +7938,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
+msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "Neplatný komentář k nahrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
@@ -7813,5 +7966,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
 msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
@@ -7846,13 +7999,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 "Nahrát seznam vašich otevřených sad změn ze serveru"
 
-#: ../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 "Zavřít zvolenou otevřenou sadu změn"
 
-#: ../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
@@ -7921,5 +8074,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}..."
@@ -7931,5 +8084,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 "Obrázky s GPS souřadnicemi"
@@ -7955,5 +8108,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"
@@ -8009,43 +8162,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 bod"
 
 #: ../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 "Přizpůsobit kreslení linií"
 
 #: ../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 "Použít globální nastavení."
 
 #: ../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 "Kreslit spojnice mezi body v této vrstvě"
 
 #: ../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 "Nereslit spojnice mezi body v této vrstvě"
 
 #: ../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 ""
 
 #: ../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 "Přizpůsobit barvu"
 
 #: ../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"
@@ -8053,6 +8206,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"
@@ -8144,10 +8297,10 @@
 msgstr[2] "{0} značek"
 
-#: ../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 "Převést do datové vrstvy"
 
-#: ../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."
@@ -8157,43 +8310,43 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../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 "Převedeno z: {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 "Stáhnout data z OSM podél této trasy"
 
-#: ../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 "Stáhnout vše v rozmezí:"
 
-#: ../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} metrů"
 
-#: ../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 "Maximální plocha na požadavek:"
 
-#: ../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} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8204,9 +8357,9 @@
 "pokračovat?</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 "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../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 "
@@ -8214,5 +8367,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8244,6 +8397,7 @@
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Byl nalezen {0} konflikt."
+msgstr[1] "Byly nalezeny {0} konflikty."
+msgstr[2] "Bylo nalezeno {0} konfliktů."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
@@ -8257,6 +8411,12 @@
 "server."
 msgstr[0] ""
+"{0} konflikt byl <strong>vyřešen automaticky</strong> odstraněním {0} "
+"objektu<br>z lokální datové sady protože byl vymazán na serveru."
 msgstr[1] ""
+"{0} konflikty byly <strong>vyřešeny automaticky</strong> odstraněním {0} "
+"objektů<br>z lokální datové sady protože byly vymazány na serveru."
 msgstr[2] ""
+"{0} konfliktů bylo <strong>vyřešeno automaticky</strong> odstraněním {0} "
+"objektů<br>z lokální datové sady protože byly vymazány na serveru."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8269,42 +8429,47 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
+"{0} konflikt zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+"vyřešte jej manuálně."
 msgstr[1] ""
+"{0} konflikty zbývají k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+"vyřešte je manuálně."
 msgstr[2] ""
+"{0} konfliktů zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
+"vyřešte je manuálně."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
-
-#: ../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 "Klikněte pro uzavření tohoto dialogu a návrat k editaci"
+
+#: ../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} smazáno.)"
-msgstr[1] " ({0} smazáno.)"
-msgstr[2] " ({0} smazáno.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] "{0} smazán"
+msgstr[1] "{0} smazány"
+msgstr[2] "{0} smazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../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 "Verze API: {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 "Převédst do GPX vrstvy"
 
-#: ../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."
@@ -8312,5 +8477,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"
@@ -8319,5 +8484,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"
@@ -8326,5 +8491,5 @@
 msgstr[2] "body"
 
-#: ../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"
@@ -8334,5 +8499,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../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"
@@ -8342,5 +8507,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../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"
@@ -8350,9 +8515,9 @@
 msgstr[2] "{0} bodů"
 
-#: ../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 značka"
 
-#: ../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"
@@ -8361,5 +8526,5 @@
 msgstr[2] "značky"
 
-#: ../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"
@@ -8369,9 +8534,9 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../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 "Synchronizovat audio"
 
-#: ../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."
@@ -8379,5 +8544,5 @@
 "Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
-#: ../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
@@ -8385,14 +8550,14 @@
 msgstr "Zvuk zesynchronizován na bodu {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 "Není možno synchronizovat v již přehrávané vrstvě"
 
-#: ../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 ""
 
-#: ../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 "
@@ -8400,13 +8565,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Zobrazit/Skrýt Text/Ikony"
 
-#: ../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 "Přepnout viditelnost textu značek a ikon."
@@ -8470,5 +8635,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 "Zvolte řádek k editaci"
@@ -8482,5 +8647,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."
@@ -9157,12 +9322,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Aktivovat"
+msgstr "Aktivní styly"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Dostupné styly (z {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9197,60 +9361,52 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Přidat soubor nebo URL aktivního stylu"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
+msgstr "Odstranit vybrané styly ze seznamu aktivních"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
+msgstr "Upravit název souboru nebo URL vybraného aktivního stylu"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
+msgstr "Přidat vybrané dostupné styly do seznamu aktivních"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Znovu načíst seznam dostupných stylů z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Přidat nový tag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Zavřít vybrané otevřené sady změn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Upravit zvolený zdroj."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Nahrávám historii pro uzel {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Nepodařilo se nahrát data na nebo stáhnout z<br>''{0}''<br>kvůli "
-"problémům s přenosem dat.<br>Detaily(nepřeloženo): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "Neplatná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -9858,5 +10014,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}''."
@@ -9883,5 +10039,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}."
@@ -9889,5 +10045,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}"
@@ -9900,5 +10056,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}''."
@@ -10060,5 +10216,5 @@
 msgstr "Soubor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10069,19 +10225,19 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
 
-#: ../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 "Chybějící povinný atribut ''{0}'' na <nd> v cestě {1}"
 
-#: ../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 "Neplatná hodnota atributu ''ref'' elementu <nd>. Nalezeno {0}"
 
-#: ../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 ""
@@ -10089,20 +10245,20 @@
 "<relation>"
 
-#: ../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 "Chybějící atribut ''ref'' na členu v relaci {0}"
 
-#: ../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 "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
 
-#: ../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 "Chybějící atribut ''type'' na členu {0} v relaci {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10111,19 +10267,19 @@
 "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}."
 
-#: ../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 "Nekompletní <member> specifikace s 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 "Neplatný objekt s 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 ""
@@ -10134,9 +10290,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 ""
@@ -10146,25 +10302,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 "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}"
 
-#: ../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 "Chybějící atribut ''version'' na OSM objektu s id {0}"
 
-#: ../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 "Chybějící povinný atribut ''{0}''."
 
-#: ../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 ""
@@ -10172,5 +10328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10179,5 +10335,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10185,5 +10341,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10192,13 +10348,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 "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "Zpracovávám OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Připravuji data..."
@@ -10351,10 +10507,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 byl úspěšně stažen. Prosím restartujte JOSM."
-msgstr[1] "{0} Pluginy byly úspěšně staženy. Prosím restartujte JOSM."
-msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10416,7 +10571,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Aktualizuj pluginy"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10560,35 +10714,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 "neznámý"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11220,47 +11343,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 "Extrahovat pozice GPS z EXIFu"
 
-#: ../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 "Začínam prohledávat adresář"
 
-#: ../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 "Jeden z vybraných souborů je prázdný!"
-
-#: ../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 "Načíst fotografie..."
 
-#: ../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 "Nemohu najít výchozí cesto pro adresář {0}\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 "Prohledávám adresář {0}"
 
-#: ../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 "Nalezen nulový soubor v adresáři {0}\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 "Chyba při získávání souborů z adresáře {0}\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 "Korelovat vůči GPX"
 
-#: ../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."
@@ -11276,24 +11398,24 @@
 msgstr "Otevřít skupinu obrázků jako novou vrstvu."
 
-#: ../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 "Soubory GPX (*.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 "Soubor {0} je načten pod jménem \"{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 "Chyba při parsování {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 "Nemůžu číst \"{0}\""
 
-#: ../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."
@@ -11305,34 +11427,34 @@
 "pásmo<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 "Čas fotografie (z 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 "Čas GPS (načten z předchozích fotografií): "
 
-#: ../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/rrrr 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 "Jsem v časovém pásmu: "
 
-#: ../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 "Žádné 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 "Otevřít další fotografie"
 
-#: ../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 "Synchronizovat čas z fotografie GPS přijímače"
 
-#: ../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"
@@ -11342,69 +11464,69 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../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 "Neplatné 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 "<Není nahraná GPX trasa>"
 
-#: ../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 trasa: "
 
-#: ../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 "Otevřít jinou GPX trasu"
 
-#: ../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 "Časové pásmo: "
 
-#: ../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 "Posun:"
 
-#: ../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>Mohu vyfotit můj GPS přijímač.<br>Může to pomoci?</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 "Aktualizovat pozici pro: "
 
-#: ../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 "Všechny obrázky"
 
-#: ../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 "Obrázky bez exif pozice"
 
-#: ../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 "Neotagované obrázky"
 
-#: ../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 "Korelovat obrázky s GPX trasou"
 
-#: ../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 "Korelovat"
 
-#: ../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 "Auto-odhad"
 
-#: ../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 "Měli byste vybrat GPX trasu"
 
-#: ../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 "Není vybrána GPX trasa"
 
-#: ../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 ""
@@ -11415,9 +11537,9 @@
 "Očekávaný formát: {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 "Nepatné časové pásmo"
 
-#: ../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 ""
@@ -11428,65 +11550,65 @@
 "Očekávaný formát: {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 "Neplatný posun"
 
-#: ../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 "Nalezeno {0} shod s {1} v GPX trase {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 "Nahrána GPX trasa"
 
-#: ../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 "Zvolené fotografie neobsahují informace o čase."
 
-#: ../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 "Fotografie neobsahují informace o čase"
 
-#: ../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."
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../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 trasa neobsahuje časové údaje"
 
-#: ../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 "Časová zóna: {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 "Minuty: {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 "Sekundy: {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} z {1} fotografií bylo dosazeno do GPX trasy."
 
-#: ../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 "(Časový rozdíl {0} dnů)"
 
-#: ../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 "Posun mezi trasou a fotografiemi: {0}m {1}s"
 
-#: ../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 "
@@ -11494,13 +11616,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 "Dosazení fotografií do trasy selhalo."
 
-#: ../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 "Upravit časovou zónu a posun"
 
-#: ../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 "Výchozí hodnoty"
@@ -11521,5 +11643,5 @@
 msgstr "Chyba v souboru {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11532,37 +11654,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 "Vybrat Feuille"
 
-#: ../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 "Chyba při nahrávání souboru"
 
-#: ../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 "Cache soubor pro Lambertovu zónu 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 "Cache soubor pro Lambertovu zónu 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 "Cache soubor pro Lambertovu zónu 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 "Cache soubor pro Lambertovu zónu 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: Neplatné URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11576,18 +11698,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 "Vybrat commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Vyberte z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
@@ -11614,34 +11736,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 "Nahradit původní pozadí pozadím nastaveným v 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 "Obrácené stupně šedi (pro černá pozadí)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Nastavit průhledné pozadí."
 
-#: ../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 "Zobrazovat hranice stažených dat."
 
-#: ../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 "Zapnout automatické cachování."
 
-#: ../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. velikost cache (v 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."
@@ -11653,19 +11775,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS francouzského katastru"
 
-#: ../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 ""
 "<html>Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../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 "
@@ -11674,5 +11796,5 @@
 "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
 
-#: ../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). "
@@ -11682,76 +11804,76 @@
 "texty na tmavém pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Povolit skládání více vrstev"
 
-#: ../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 ""
 "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné."
 
-#: ../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 "Zobrazovat rámeček kolem dat stažených z WMS serveru."
 
 #. 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 "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
 
-#: ../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 "Fixní velikost čtverce (výchozí je 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 "Fixní velikost (od 25 do 1000 metrů)"
 
-#: ../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 ""
 "Nejstarší soubory jsou automaticky smazány při překročení této velikosti"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Přidat \"source=...\" k objektům?"
 
-#: ../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 "Stahuji {0}"
 
-#: ../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 "Kontaktuji WMS server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Vytvořit budovy"
 
-#: ../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"
@@ -11761,30 +11883,30 @@
 "import budov je omezen na max. 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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "Extrahovat SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Vytvořit hranice"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Kontaktuji WMS katastru ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr "Obrázek je již načtený"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -11792,29 +11914,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 ""
 
-#: ../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 "Pouze na vektorizovaných vrstvách"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 "Stáhnout obráze z Francouzkého katastrálního WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Katastr: {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"
@@ -11823,13 +11945,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"
@@ -11837,5 +11959,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"
@@ -11845,14 +11967,14 @@
 "(jsou potřeba dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
 msgid "Image cropping"
 msgstr "Ořezávání obrázků"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Click second corner for image cropping"
 msgstr "Klikněte na druhý roh pro oříznutí obrázku"
 
-#: ../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"
@@ -11860,14 +11982,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"
@@ -11877,64 +11999,64 @@
 "nebo jen opakovat "
 
-#: ../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 "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Sever"
 
-#: ../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 "Ručně nastavit Lambertovu zónu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Zone"
 msgstr "Zóna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Lambertova zóna"
 
-#: ../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 "Načíst lokaci z cache (pouze pokud je cache povolena)"
 
-#: ../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 "{0} není se současnou projekcí dovolena"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Změnit umístění"
 
-#: ../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 "Nastavení nového místa pro další požadavek"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Přidat novou vrstvu"
 
-#: ../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 "Umístění"
 
-#: ../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 "
@@ -11944,25 +12066,25 @@
 "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 "Přidat novou vrstvu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Vymazat cookie"
 
-#: ../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 "Získat nový cookie (vypršení sezení)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "PNG soubory (*.png)"
 
-#: ../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 "Exportovat v PNG formátu (pouze rastrové obrázky)"
 
-#: ../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
@@ -11973,14 +12095,14 @@
 msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)"
 
-#: ../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 "Upravit WMS"
 
-#: ../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 "Upravit pozici WMS vrstvy (pouze rastrové obrázky)"
 
-#: ../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"
@@ -11988,5 +12110,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
@@ -11994,5 +12116,5 @@
 msgstr "Stahovat WMS dlaždice z {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"
@@ -12002,34 +12124,34 @@
 "Nejdříve vyberte jednu z nich a potom zopakujte"
 
-#: ../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 "Prázdná vrstva"
 
-#: ../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 vrstva ({0}), nahráno {1} dlaždic"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../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 "Velikost rastru: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12040,9 +12162,9 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../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}"
@@ -12050,9 +12172,9 @@
 "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12161,9 +12283,9 @@
 msgstr "Vytvořit duplikát cesty"
 
-#: ../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 "Vrstva pro editaci GPX tras"
 
-#: ../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 "Konvertovat do GPX vrstvy s anonymizací času"
@@ -12180,11 +12302,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 "Importovat cestu z GPX vrstvy"
 
 #: ../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 "Zahodit existující cestu"
@@ -12194,5 +12316,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 "Nenalezena vrstva s GPX daty."
@@ -12405,5 +12527,5 @@
 msgstr "Zobrazit negeotagované fotografie"
 
-#: ../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 "Importované obrázky"
@@ -12837,5 +12959,5 @@
 msgstr "Úhel mezi dvěmi zvolenými uzly"
 
-#: ../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 "Vrstva pro prováděná měření"
@@ -12914,5 +13036,5 @@
 msgstr "Stahovací smyčka 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 "Zobrazuje chyby z OpenStreetBugs"
@@ -13057,7 +13179,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Vrstva"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13224,43 +13345,41 @@
 msgstr "Zadejte jednotky váhy"
 
-#: ../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 "Aktuální mapa"
 
-#: ../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 "Automatické přiblížení: "
-
-#: ../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 "Nahrát dlaždici"
 
-#: ../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 "Zobrazit informace"
-
-#: ../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 "Nahrát všechny dlaždice"
 
-#: ../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 "Zvětšit přiblížení"
 
-#: ../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 "Zmenšit přiblížení"
 
-#: ../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 "Vyprázdnit cache dlaždic"
 
-#: ../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 "obrázek "
@@ -13296,7 +13415,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max. úroveň přiblížení: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13651,6 +13769,6 @@
 msgstr "Jste si jist?"
 
-#: ../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
@@ -13658,5 +13776,5 @@
 msgstr "Chyby kontroly"
 
-#: ../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 "Žádné chyby při kontrole"
@@ -13745,5 +13863,5 @@
 msgstr "ostatní kontroly"
 
-#: ../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}"
@@ -13843,7 +13961,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Nespojená pobřežní linie"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13873,18 +13990,18 @@
 msgstr "Zkřížené cesty"
 
-#: ../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 "Duplicitní uzly"
 
-#: ../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 "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
-#: ../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 "Uzly na stejné pozici"
 
-#: ../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 "Potvrzení"
@@ -14044,80 +14161,80 @@
 #. 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 "Problém s vykreslováním"
 
-#: ../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 "Klíč ''{0}'' je neplatný."
 
-#: ../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 "Klíče s prázdnými hodnotami"
 
-#: ../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 "Neplatné klíče vlastností"
 
-#: ../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 "Neplatná mezera v klíči vlastnosti"
 
-#: ../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 "Hodnota začíná nebo končí mezerou"
 
-#: ../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 "Hodnota obsahuje HTML entitu"
 
-#: ../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 "Klíč ''{0}'' není v předvolbách."
 
-#: ../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 "Předvolby neobsahují vlastnost klíč"
 
-#: ../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 "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení"
 
-#: ../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 "Předvolby neobsahují vlastnost hodnota"
 
-#: ../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 "OPRAVY"
 
-#: ../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 "Kontrola klíčů vlastností."
 
-#: ../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 "Kontroluje platnost klíčů vlastností proti seznamu slov."
 
-#: ../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 "Použít komplexní kontrolu vlastností"
 
-#: ../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 "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel."
 
-#: ../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 "zdroj TagCheckeru"
 
-#: ../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."
@@ -14125,86 +14242,86 @@
 msgstr ""
 
-#: ../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 "Přidat nový zdroj do seznamu."
 
-#: ../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 "Upravit zvolený zdroj."
 
-#: ../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 "Smazat vybraný zdroj ze seznamu."
 
-#: ../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 "Zdroje dat"
 
-#: ../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 "Kontrola hodnot vlastností."
 
-#: ../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 "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám."
 
-#: ../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 "Zkontrolovat tagy s FIXME."
 
-#: ../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 "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti."
 
-#: ../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 ""
 
-#: ../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 "Kontroila, zda při kreslení mapy nebyly nalezeny chyby."
 
-#: ../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 "Použít stadardní datový soubor."
 
-#: ../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 "Použít standardní datový soubor (doporučeno)."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Opravit vlastnosti"
 
-#: ../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 "Nelze najít typ elementu"
 
-#: ../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 "Nelze najít úroveň varování"
 
-#: ../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 "Neplatný výraz ''{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}''"
@@ -14381,17 +14498,17 @@
 msgstr "Tento test kontroluje na blízkost koncových uzlů cest k jiným cestám"
 
-#: ../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 "Koncový uzel cesty poblíž jiné silnice"
 
-#: ../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 "Koncový uzel cesty poblíž jiné cesty"
 
-#: ../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 "Uzel cesty poblíž jiné cesty"
 
-#: ../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 "Spojený koncový uzel cest poblíž jiné cesty"
@@ -14442,13 +14559,13 @@
 msgstr "Tento test kontroluje směr vodních, zemních a pobřežních linií."
 
-#: ../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 "Obrácené pobřeží: země není na levé straně"
 
-#: ../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 "Obrácená vodní cesta: země není na levé straně"
 
-#: ../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 "Obrácená země: země není na levé straně"
@@ -14484,7 +14601,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 vrstva ({0}), stahování v přiblížení {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14492,84 +14609,67 @@
 msgstr "Walking Papers"
 
-#: ../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 "Vyberte počáteční bod na konci cesty"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Dosažen konec cesty"
-
-#. 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"
-msgstr "Dosažena křižovatka"
+#: ../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 "Stáhnout"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Stáhnout data z OSM serveru"
+
+#: ../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>Není zde žádné vrstvy pro zdrojovou vrstvu<br>''{0}''<br>které by měly "
+"být sloučeny.</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 "Odstraňuji duplicitní uzly..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Nastala výjimka"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "nápověda"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Nápověda / O programu"
-
-#: ../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 ""
-"Přidávat upravovat a mazat položky WMS pluginu můžete na záložce nastavení - "
-"položky se následně zobrazí v menu WMS.\n"
-"\n"
-"Totéž můžete také udělat v pokročilých volbách za použití následujícího "
-"schema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... atd\n"
-"\n"
-"Příklad kompletního URL WMS (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , "
-"potřebujete zadat pouze odpovídající 'id'.\n"
-"Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL jako v "
-"příkladu a 73 nahraďte id vašeho obrázku:\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"
-"Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně šiřitelný), "
-"pokud si nejste jisti, nepoužívejte jej."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Nápověda pluginu WMS Plugin"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14673,28 +14773,28 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../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 "(deaktivované)"
 
-#: ../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 vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../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 vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14705,13 +14805,13 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../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"
@@ -14719,42 +14819,42 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../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 "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
@@ -19214,14 +19314,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Archeologické naleziště"
+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 "Upravit archeologické naleziště"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27190,28 +27288,191 @@
 msgstr "Český UHUL:ORTOFOTO"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "V historii není žádný prvek s verzí {0}"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "V historii není žádná verze platná k datu ''{0}''"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "nenalezena starší verze. Historie je prázdná."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "nenalezena novější verze. Historie je prázdná."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "V této datové sadě nelze nalézt prvek s id {0}"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Vyberte počáteční bod na konci cesty"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Dosažen konec cesty"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Dosažena křižovatka"
+
+#~ msgid "help"
+#~ msgstr "nápověda"
+
+#~ msgid "Help / About"
+#~ msgstr "Nápověda / O programu"
+
+#~ 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 ""
+#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce "
+#~ "nastavení - položky se následně zobrazí v menu WMS.\n"
+#~ "\n"
+#~ "Totéž můžete také udělat v pokročilých volbách za použití následujícího "
+#~ "schema:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... atd\n"
+#~ "\n"
+#~ "Příklad kompletního URL WMS (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , "
+#~ "potřebujete zadat pouze odpovídající 'id'.\n"
+#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL "
+#~ "jako v příkladu a 73 nahraďte id vašeho obrázku:\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"
+#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně "
+#~ "šiřitelný), pokud si nejste jisti, nepoužívejte jej."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Nápověda pluginu WMS Plugin"
+
 #~ msgid "File could not be found."
 #~ msgstr "Soubor nebyl nalezen"
 
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "No data imported."
+#~ msgstr "Nic nebylo importováno"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
 #~ msgid "Please select at least one task to download"
 #~ msgstr "Prosím zvol aspoň jeden úkol ke stažení"
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Nahrándí do OSM API selhalo"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktní relace"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
-#~ "relace?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM Online Nápověda"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Otevřít v prohlížeči"
+
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznámá přípona souboru."
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Smazat {1} {0}"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "Move"
+#~ msgstr "Přesunout"
+
+#~ msgid "false"
+#~ msgstr "nepravda"
+
+#~ msgid "true"
+#~ msgstr "pravda"
+
+#~ msgid "different"
+#~ msgstr "různé"
+
+#~ msgid "position"
+#~ msgstr "pozice"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "their version:"
+#~ msgstr "verze na serveru:"
+
+#~ msgid "resolved version:"
+#~ msgstr "finální verze:"
+
+#~ msgid "my version:"
+#~ msgstr "moje verze:"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neuložené změny"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Chyba při načítání stránky {0}"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nemohu se připojit na server."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Vznikly konflikty během importu"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Nejdříve zvolte záložku"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Chyba parsování odezvy serveru"
+
+#~ msgid "name"
+#~ msgstr "jméno"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Kontaktuji OSM server..."
 
 #~ msgid "Error while parsing"
@@ -27220,146 +27481,4 @@
 #~ msgid "File not found"
 #~ msgstr "Soubor nebyl nalezen"
-
-#~ msgid "Replace"
-#~ msgstr "Nahradit"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Nejdříve zvolte záložku"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Prosím, zadejte hledaný řetězec"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nemohu načíst výsledky hledání ze serveru"
-
-#~ msgid "name"
-#~ msgstr "jméno"
-
-#~ msgid "zoom"
-#~ msgstr "Zvětšení"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Zkopírovat výchozí hodnoty"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vyberte řádek ke zkopírování."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Pridat do seznamu nový XML zdroj."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Počet dní, po kterých se zobrazí varování<br>můžete změnit pomocí "
-#~ "'pluginmanager.warntime'.)"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Zobrazit stav dlaždice"
-
-#~ msgid "Request Update"
-#~ msgstr "Vyžádat aktualizaci"
-
-#~ msgid "error loading metadata"
-#~ msgstr "chyba při nahrávání metadat"
-
-#~ msgid "requested: {0}"
-#~ msgstr "požadováno: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "chyba při poždavku na aktualizaci"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "No data imported."
-#~ msgstr "Nic nebylo importováno"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápověda"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otevřít v prohlížeči"
-
-#~ msgid "unnamed"
-#~ msgstr "nepojmenováno"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznámá přípona souboru."
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Smazat {1} {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Move"
-#~ msgstr "Přesunout"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené změny"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Chyba při načítání stránky {0}"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nemohu se připojit na server."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Vznikly konflikty během importu"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Chyba parsování odezvy serveru"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontaktuji OSM server..."
 
 #~ msgid "Combine ways with different memberships?"
@@ -27374,4 +27493,7 @@
 #~ msgstr "Všechny cesty byli prázdné"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Prosím, zadejte hledaný řetězec"
+
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyřešit konflikty"
@@ -27406,4 +27528,7 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktní relace"
 
 #~ msgid "Merging conflicts."
@@ -27567,4 +27692,7 @@
 #~ msgstr "Importovat TCX soubor..."
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vyberte řádek ke zkopírování."
+
 #~ msgid "viaduct"
 #~ msgstr "viadukt"
@@ -27572,4 +27700,10 @@
 #~ msgid "Drawbridge"
 #~ msgstr "Padací most"
+
+#~ msgid "zoom"
+#~ msgstr "Zvětšení"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nemohu načíst výsledky hledání ze serveru"
 
 #~ msgid "Occupied By"
@@ -27676,4 +27810,19 @@
 #~ msgid "Merge Anyway"
 #~ msgstr "Přesto sloučit"
+
+#~ msgid "requested: {0}"
+#~ msgstr "požadováno: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "chyba při poždavku na aktualizaci"
+
+#~ msgid "error loading metadata"
+#~ msgstr "chyba při nahrávání metadat"
+
+#~ msgid "Request Update"
+#~ msgstr "Vyžádat aktualizaci"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Zobrazit stav dlaždice"
 
 #~ msgid "Download Image from french Cadastre WMS"
@@ -27794,4 +27943,11 @@
 #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
 #~ "plugin může být použit pro přípravu tras pro uploud do OSM."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Počet dní, po kterých se zobrazí varování<br>můžete změnit pomocí "
+#~ "'pluginmanager.warntime'.)"
 
 #~ msgid ""
@@ -27849,4 +28005,7 @@
 #~ msgstr "cesty"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Nahrándí do OSM API selhalo"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Selhala inicializace API, prosím zkuste to znovu později."
@@ -27894,4 +28053,10 @@
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Pridat do seznamu nový XML zdroj."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
 
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -27965,6 +28130,25 @@
 #~ msgstr "zatím nerozhodnoto"
 
+#~ msgid "Replace"
+#~ msgstr "Nahradit"
+
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chybějící povinný atribut ''{0}''"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
+#~ "relace?</html>"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Zkopírovat výchozí hodnoty"
 
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 18508)
+++ applications/editors/josm/i18n/po/da.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:39+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:00+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Danish <da@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:04+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 "Fejl"
@@ -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"
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -457,5 +458,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
@@ -497,5 +498,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
@@ -504,6 +505,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"
@@ -691,5 +693,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
@@ -702,5 +704,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"
@@ -772,5 +774,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
@@ -778,28 +788,28 @@
 msgstr ""
 
-#: ../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 "Der var {0} konflikter under import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikt ved download"
 
-#: ../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}"
@@ -836,10 +846,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 "Eksporter til 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 "Eksporter dataet til GPS-fil."
@@ -852,11 +862,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
@@ -887,5 +896,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
@@ -900,17 +908,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
@@ -970,5 +979,5 @@
 msgstr "Forbind et punkt til nærmeste stykke vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Forbind punkt og linje"
@@ -999,22 +1008,19 @@
 msgstr "Vælg mindst to punkter, der skal forenes."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Afbryder..."
-
-#: ../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 ikke forene punkter: Ville være nødt til at slette en vej, som stadigvæk "
-"er i brug."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1155,7 +1161,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Henter data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1302,10 +1307,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 "Gem"
 
 #: ../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 "Gem nuværende data."
@@ -1362,10 +1367,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 "Gem som..."
 
 #: ../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 "Gem det nuværende data i en ny fil."
@@ -1407,25 +1412,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 "Luk"
 
-#: ../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 "Opdel vej"
 
-#: ../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 "Opdel en vej ved det valgte punkt"
 
-#: ../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 "Det nuværende valgte kan ikke bruges til opdeling"
 
-#: ../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."
@@ -1433,5 +1438,5 @@
 msgstr[1] "De valgte punkter er ikke i midten af nogen vej."
 
-#: ../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 "
@@ -1445,9 +1450,9 @@
 "Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen."
 
-#: ../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 valgte punkter deler ikke samme vej."
 
-#: ../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."
@@ -1455,10 +1460,10 @@
 msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
 
-#: ../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 "Du skal vælge mindst to punkter for at opdele en kredsformig vej"
 
-#: ../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 "
@@ -1468,5 +1473,5 @@
 "vejen.)"
 
-#: ../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 "
@@ -1474,5 +1479,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 "
@@ -1480,5 +1485,5 @@
 msgstr ""
 
-#: ../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"
@@ -1508,37 +1513,37 @@
 msgstr "Dublet-punkter, som bruges af flere veje."
 
-#: ../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 "Dette punkt er ikke forbundet til noget andet."
 
-#: ../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 "Ingen af disse punkter er fastklistret til noget andet."
 
-#: ../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 "Ingen af denne vejs punkter er forbundet til noget andet."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vælg enten:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Et markeret punkt, eller"
 
-#: ../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 "* Et punkt, som bruges af mere end én vej, eller"
 
-#: ../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 "* Et punkt, som bruges af mere end én vej en af disse veje, eller"
 
-#: ../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"
@@ -1547,5 +1552,5 @@
 "eller"
 
-#: ../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."
@@ -1554,5 +1559,5 @@
 "vej."
 
-#: ../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"
@@ -1562,9 +1567,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1572,5 +1577,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"
@@ -1611,12 +1616,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Tegn omridset af data hentet fra serveren."
+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 ""
@@ -1632,6 +1636,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Opdater det valgte"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1645,5 +1650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Der er ingen valgte primitiver at opdatere."
 
@@ -1651,4 +1657,9 @@
 msgid "Selection empty"
 msgstr "Intet er valgt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Opdater det valgte"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1793,7 +1804,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Ret {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1915,9 +1926,9 @@
 msgstr "Hent GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Henter data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1925,5 +1936,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 ""
@@ -1939,7 +1950,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Brugerens navn."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1955,7 +1965,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Klik for at fjerne destination"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1974,7 +1983,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Følgende fejl opstod under den samlede download:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -1984,7 +1993,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Fejl ved download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1998,5 +2006,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
@@ -2029,6 +2037,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 "valgt"
@@ -2046,26 +2054,26 @@
 msgstr "Tilføj punkt inde i vej"
 
-#: ../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 "Forbind eksisterende vej til punkt"
 
-#: ../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 "Tilføj et nyt punkt til en eksisterende vej"
 
-#: ../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 "Tilføj punkt ind i vej og forbind"
 
-#: ../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 "Opret nyt punkt."
 
-#: ../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 "Vælg punkt under markøren."
 
-#: ../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."
@@ -2074,46 +2082,44 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../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 ny vej fra seneste punkt."
 
-#: ../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 "Fortsæt vej fra seneste punkt."
 
-#: ../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 "Afslut tegning."
 
-#: ../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 "Træk ud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Opret områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Træk vej ud"
 
-#: ../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 "Slip museknappen for at vælge objekterne inden i firkanten."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Tegn en firkant af passende størrelse og slip så museknappen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Tegn en firkant af passende størrelse og slip så museknappen."
 
-#: ../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 "Slip museknappen for at stoppe rotationen."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Tegn et vejsegment for at danne et rektangel."
 
@@ -2168,4 +2174,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2174,4 +2184,8 @@
 "Slip museknappen for at stoppe flytningen. Ctrl for at koble sammen med "
 "nærmeste punkt."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Slip museknappen for at stoppe rotationen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2200,67 +2214,70 @@
 msgstr ""
 
-#: ../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 "Søg..."
 
-#: ../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 "Søg efter objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Indtast en søgetekst."
 
-#: ../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 "regulært udtryk"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "erstat valgte"
 
-#: ../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 "føj til valgte"
 
-#: ../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 "fjern fra valgte"
 
-#: ../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 "versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regulært udtryk"
 
-#: ../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>Baker Street</b> - 'Baker' og 'Street' i enhver nøgle eller navn."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' i enhver nøgle eller navn."
 
-#: ../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:Bak</b> - 'Bak' hvor som helst i navnet."
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2268,34 +2285,34 @@
 msgstr ""
 
-#: ../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:Bak</b> - intet 'Bak' i navnet."
 
-#: ../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 ""
 
-#: ../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>Specielle mål:</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 ""
 
-#: ../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>user:</b>... - alle objekter rettet af bruger"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2303,44 +2320,44 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle ændrede objekter"
 
-#: ../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 valgte objekter"
 
-#: ../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 ufuldstændige objekter"
 
-#: ../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 ""
 
-#: ../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 ""
 "Brug <b>|</b> eller <b>OR</b> to for at forbinde med et logisk \"eller\""
 
-#: ../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 "Brug <b>\"</b> for at angive operatorer (fx hvis key indeholder : )"
 
-#: ../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 "Brug <b>(</b> og <b>)</b> for at gruppere udtryk"
 
-#: ../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
@@ -2350,51 +2367,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 "Søg"
 
-#: ../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 søgning"
 
-#: ../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 "Intet resultat for \"{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 "Intet tilføjet til det valgte ved søgning efter \"{0}\""
 
-#: ../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 "Intet fjernet fra det valgte ved søgning efter \"{0}\""
 
-#: ../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 "Fandt {0} resultater"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr "Versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr "Ikke-versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr "Regulært udtryk"
@@ -2567,6 +2584,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
@@ -2691,5 +2708,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 ""
@@ -2710,9 +2727,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 "parameteren \"{0}\" må ikke være en null-værdi"
+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"
@@ -2748,5 +2768,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 "Opdel vejstykke"
@@ -2754,6 +2774,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."
@@ -2765,5 +2785,5 @@
 "måske bruger dem.<br>Vil du virkelig slette?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2774,5 +2794,15 @@
 msgstr ""
 
-#: ../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"
@@ -2854,5 +2884,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"
@@ -2959,8 +2989,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 "Standardværdien er \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3140,5 +3176,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
@@ -3152,5 +3188,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 ""
@@ -3158,4 +3194,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 "Mangler argument fro \"ikke\"."
+
+#: ../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 ""
 
@@ -3213,32 +3285,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Fejl: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advarsel: {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 ""
 
@@ -3263,45 +3336,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 "Der er ingen primitiver med versionen {0} i denne historik"
-
-#: ../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 "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {2}"
 
-#: ../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 "Fandt ikke en primitiv med id {0} i dette datasæt"
-
-#: ../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
@@ -3312,6 +3368,7 @@
 msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
 
-#: ../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 ""
 
@@ -3322,145 +3379,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 "En vej af typen Område er ikke lukket."
 
-#: ../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 "multipolygon-vej \"{0}\" er ikke lukket."
 
-#: ../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 "Slettede medlem \"{0}\" i relation"
 
-#: ../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 "Vej \"{0}\" med mindre end to punkter."
 
-#: ../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 "Mere end én \"fra\"-vej blev fundet."
 
-#: ../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 "Mere end én \"til\"-vej blev fundet."
 
-#: ../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 "Mere end én \"via\" blev fundet."
 
-#: ../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 "Ukendt rolle \"{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 "Ukendt medlemstype for \"{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 "Ingen \"fra\"-vej blev fundet."
 
-#: ../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 "Ingen \"til\"-vej blev fundet."
 
-#: ../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 "Intet \"via\"-punkt eller vej blev fundet."
 
-#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../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 "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../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 "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../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 ""
 
-#: ../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 "Overlap mellem vejene \"{0}\" og \"{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 "Indre vej \"{0}\" er på ydersiden."
 
-#: ../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 "Ingen brugbar rolle \"{0}\" for vej \"{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 "Ikke-vej \"{0}\" i multipolygon."
 
-#: ../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 "Ingen ydre vej for multipolygon \"{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 ""
 
-#: ../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 ""
 
-#: ../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 "utagget"
 
-#: ../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 "Fejl: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advarsel: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../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
@@ -3470,5 +3527,5 @@
 msgstr[1] "noder"
 
-#: ../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
@@ -3478,6 +3535,6 @@
 msgstr[1] "veje"
 
-#: ../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
@@ -3487,13 +3544,13 @@
 msgstr[1] "relationer"
 
-#: ../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 "utagget vej"
 
-#: ../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 "ukomplet vej"
 
-#: ../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
@@ -3501,5 +3558,5 @@
 msgstr "baggrund"
 
-#: ../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 "fremhæv"
@@ -3578,5 +3635,5 @@
 msgstr "Vis ikke igen"
 
-#: ../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
@@ -3584,32 +3641,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 "ufuldstændig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "landevej"
 
-#: ../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 "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vandvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "brug af jord"
 
-#: ../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"
@@ -3618,5 +3675,5 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3625,33 +3682,33 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../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
@@ -3659,9 +3716,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Ukendt vært"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3683,7 +3740,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Klik for at fjerne destination"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3880,5 +3936,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 "Rediger"
@@ -4004,10 +4060,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 "lag er ikke i listen"
 
-#: ../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"
@@ -4015,7 +4071,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Nej, fortryd handlingen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4138,5 +4193,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"
@@ -4145,5 +4200,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"
@@ -4153,5 +4208,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 "Medlemmer"
@@ -4582,5 +4637,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 ""
@@ -4638,6 +4693,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 "<udefineret>"
@@ -4766,4 +4819,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"
@@ -4860,5 +4914,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"
@@ -4869,5 +4923,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"
@@ -4886,7 +4940,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Behold mine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -4909,7 +4962,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Indtast værdier for alle konflikter."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4995,5 +5047,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
@@ -5089,5 +5141,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"
@@ -5143,11 +5195,11 @@
 msgstr "Vis historikken for alle valgte elementer."
 
-#: ../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
@@ -5155,13 +5207,13 @@
 msgstr "Genindlæs"
 
-#: ../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 "Genindlæs alle valgte objekter og genopfrisk listen."
 
-#: ../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 ""
@@ -5218,7 +5270,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] "Dette vil ændre på op til {0} objekt."
@@ -5226,5 +5277,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 "En tom værdi vil slette nøglen."
 
@@ -5249,4 +5301,11 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
+#: ../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] "Dette vil ændre på op til {0} objekt."
+msgstr[1] "Dette vil ændre på op til {0} objekter."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5323,60 +5382,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 "Relationer"
 
-#: ../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 "Åbn en liste over alle relationer"
 
-#: ../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 "Relationer: {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 "Åbn en editor for den valgte relation"
 
-#: ../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 "Slet de nvalgte relation"
 
-#: ../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 "Opret en ny relation"
 
-#: ../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 "Slet de nvalgte relation"
-
-#: ../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 "Vælg enten:"
-
-#: ../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 "Slet de nvalgte relation"
-
-#: ../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 "Hent medlemmer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5531,5 +5586,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}"
@@ -5768,18 +5823,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 ""
@@ -5802,5 +5857,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}"
@@ -5871,7 +5926,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Der er ingen rettesæt åbne."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -5883,12 +5937,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Opret områder"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Flyt det nuværende valgte medlem ned"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5899,7 +5951,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 "Indtast et navn for stedet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5909,12 +5960,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Flyt det nuværende valgte medlem op"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Flyt det nuværende valgte medlem op"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5974,7 +6023,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Opdel en vej ved det valgte punkt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5983,7 +6031,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Den valgte vej indeholder ikke det valgte punkt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6007,7 +6054,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Intet valgt GPX-spor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6022,17 +6068,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Luk dialog og fortryd download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Flyt det nuværende valgte medlem op"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Vælg venligst rækken, der skal rettes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6048,7 +6091,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Indtast et stednavn at søge efter:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6062,7 +6104,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Søg..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6996,7 +7037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "nær"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7041,5 +7081,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 ""
@@ -7053,5 +7093,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 ""
@@ -7062,5 +7102,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 ""
@@ -7069,19 +7109,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 ""
@@ -7091,32 +7131,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 ""
@@ -7138,37 +7178,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 ""
@@ -7176,5 +7216,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 ""
@@ -7182,9 +7222,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 ""
@@ -7193,24 +7233,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 "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
+
+#: ../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}"
@@ -7223,4 +7273,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoom til problem"
+
+#: ../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 "historie"
+
+#: ../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
@@ -7233,17 +7301,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 "ikke slettet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Bruger"
 
-#: ../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 "ukendt"
+
+#: ../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 "Anonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7268,4 +7386,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 "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "slettet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7610,9 +7743,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] "Ændrede objekter:"
-msgstr[1] "Ændrede objekter:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7692,13 +7825,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
@@ -7765,5 +7898,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}..."
@@ -7775,5 +7908,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 "Geotaggede billeder"
@@ -7799,5 +7932,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"
@@ -7852,43 +7985,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-punkt"
 
 #: ../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 "Tilpas linjetegning"
 
 #: ../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 "Brug globale indstillinger."
 
 #: ../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 "Tegn linjer mellem punkter for dette lag."
 
 #: ../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 "Tegn ikke linjer mellem punkter for dette lag."
 
 #: ../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 "Vælg linjetegnings-indstillinger"
 
 #: ../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 "Tilpas farve"
 
 #: ../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"
@@ -7896,6 +8029,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"
@@ -7985,10 +8118,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../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 "Konvertér til datalag"
 
-#: ../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."
@@ -7998,43 +8131,43 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../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 "Konverteret fra: {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 "Hent fra OSM langs dette spor"
 
-#: ../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 "Hent alt inden for:"
 
-#: ../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} meter"
 
-#: ../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 ""
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8045,10 +8178,10 @@
 "du<br>at fortsætte?</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 ""
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../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 "
@@ -8056,5 +8189,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8111,37 +8244,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Luk dialog og fortryd download"
-
-#: ../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} slettet.)"
-msgstr[1] " ({0} slettet.)"
-
-#: ../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} består af:"
 
-#: ../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-version: {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 "Konvertér til GPX-lag"
 
-#: ../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."
@@ -8149,5 +8281,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"
@@ -8156,5 +8288,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"
@@ -8162,5 +8294,5 @@
 msgstr[1] "punkter"
 
-#: ../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"
@@ -8169,5 +8301,5 @@
 msgstr[1] "et spor med {0} punkter"
 
-#: ../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"
@@ -8176,5 +8308,5 @@
 msgstr[1] "{0} består af {1} spor"
 
-#: ../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"
@@ -8183,9 +8315,9 @@
 msgstr[1] "{0} punkter"
 
-#: ../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-markør"
 
-#: ../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"
@@ -8193,5 +8325,5 @@
 msgstr[1] "markører"
 
-#: ../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"
@@ -8200,9 +8332,9 @@
 msgstr[1] "{0} består af {1} markører"
 
-#: ../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 "Synkronisér lyd"
 
-#: ../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."
@@ -8211,5 +8343,5 @@
 "angivelsen."
 
-#: ../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
@@ -8217,14 +8349,14 @@
 msgstr "Lyd synkroniseret på punkt {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 ikke synkronisere i det afspillede lag."
 
-#: ../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 "Sæt audio-markør ved afspilnings-starten"
 
-#: ../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 "
@@ -8232,13 +8364,13 @@
 msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
 
-#: ../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 "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
 
-#: ../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 "Vis/skjul tekst/ikoner"
 
-#: ../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 "Skift synligheden for markør-tekst og -ikoner"
@@ -8304,5 +8436,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 "Vælg venligst rækken, der skal rettes."
@@ -8316,5 +8448,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."
@@ -9036,12 +9168,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Slet den valgte kilde fra listen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Ret værdien for den valgte nøgle for alle objekter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9055,17 +9185,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Tilføj en kommentar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Genopfrisk listen til udvælgelse."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Ret den valgte kilde."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9689,5 +9816,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}''."
@@ -9714,5 +9841,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}."
@@ -9720,5 +9847,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}"
@@ -9731,5 +9858,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}''."
@@ -9882,5 +10009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9889,38 +10016,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 ""
@@ -9928,19 +10055,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 "Ufuldstændig <member>-specifikation med 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 "Ugyldigt objekt med 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 ""
@@ -9951,9 +10078,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 ""
@@ -9963,25 +10090,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 ""
@@ -9989,5 +10116,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9996,5 +10123,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10002,5 +10129,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10009,13 +10136,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 "Forbereder OSM-data..."
 
-#: ../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 ""
@@ -10166,9 +10293,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} udvidelse blev succesfuldt hentet ned. Genstart venligst JOSM."
-msgstr[1] "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10230,7 +10357,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Opdater udvidelser"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10373,35 +10499,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 "ukendt"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11026,47 +11121,46 @@
 "{0} km/t"
 
-#: ../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 "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../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 ""
 
-#: ../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 "Flyt det valgte lag en række op."
-
-#: ../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 "Indlæs billeder..."
 
-#: ../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 ikke hente den kanoniske sti for mappen {0}\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 "Tjekker mappen {0}"
 
-#: ../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 "Fandt en null-fil i mappen {0}\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 "Fejl ved hentning af filer fra mappen {0}\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 "Sammenhold med GPX"
 
-#: ../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."
@@ -11082,24 +11176,24 @@
 msgstr "Hent billedsæt som et nyt lag."
 
-#: ../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-filer (*.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 "Filen {0} er hentet, dog under navnet \"{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 "Fejl ved indlæsning {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 "Kunne ikke læse \"{0}\""
 
-#: ../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."
@@ -11111,34 +11205,34 @@
 "vælg en tidszone<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 "Tidspunkt for foto (fra 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-tidspunkt (aflæst fra ovenstående 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/åååå tt: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 "Jeg er i tidszonen: "
 
-#: ../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 "Ingen dato"
 
-#: ../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 "Åbn et andet 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 "Synkronisér tiden fra et billede på GPS-modtageren"
 
-#: ../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"
@@ -11148,70 +11242,70 @@
 "Brug venligst det angivne format"
 
-#: ../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 "Ugyldig dato"
 
-#: ../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 "<Intet GPX-spor er indlæst endnu>"
 
-#: ../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-spor: "
 
-#: ../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 "Åben endnu en GPX-sporing"
 
-#: ../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 "Tidszone: "
 
-#: ../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 "Forskydning:"
 
-#: ../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>Jeg kan tage et billede af min GPS-modtager.<br>Hjælper det?</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 "Opdater position for: "
 
-#: ../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 billeder"
 
-#: ../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 "Billeder uden EXIF-position"
 
-#: ../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 "Endnu ikke taggede billeder"
 
-#: ../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 "Tilpas billeder med GPX-spor"
 
-#: ../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 "Sammenhold"
 
-#: ../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 "Automatisk gæt"
 
-#: ../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 "Du bør vælge et GPX-spor"
 
-#: ../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 "Intet valgt GPX-spor"
 
-#: ../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 ""
@@ -11222,9 +11316,9 @@
 "Forventet format: {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 "Ugyldig tidszone"
 
-#: ../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 ""
@@ -11235,65 +11329,65 @@
 "Forventet format: {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 "Ugyldig forskydning"
 
-#: ../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 ""
 
-#: ../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-spor hentet"
 
-#: ../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 "Det valgte billede rummer ingen tidsangivelse"
 
-#: ../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 "Billederne rummer ingen tidsangivelser"
 
-#: ../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."
 msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
 
-#: ../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-sporet har ingen tidsangivelser."
 
-#: ../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 "Tidszone: {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 "Minutter: {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 "Sekunder: {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 ""
 
-#: ../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 "(Tidsforskel på {0} dage)"
 
-#: ../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 "Forskydning mellem spor og billeder: {0}m {1}s"
 
-#: ../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 "
@@ -11301,13 +11395,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 ""
 
-#: ../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 "Justér tidszone og forskydning"
 
-#: ../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 "Standardværdier"
@@ -11328,5 +11422,5 @@
 msgstr "Fejl i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11339,37 +11433,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 "Fejl ved indlæsning af fil"
 
-#: ../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 "Lambert Zone 1 cache-fil (.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 "Lambert Zone 2 cache-fil (.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 "Lambert Zone 3 cache-fil (.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 "Lambert Zone 4 cache-fil (.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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11381,18 +11475,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Vælg fra..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11419,34 +11513,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Tilvælg automatisk caching."
 
-#: ../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 "Maks. cachestørrelse (i 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."
@@ -11458,18 +11552,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Kilde"
 
-#: ../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 "
@@ -11479,5 +11573,5 @@
 "defineret i JOSM-indstillingerne."
 
-#: ../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). "
@@ -11485,75 +11579,75 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 "Fast størrelse (fra 25 til 1.000 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 ""
 "Ældste filer bliver automatisk slettet, når denne størrelse overskrides."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Tilføj \"source=...\" til elementer?"
 
-#: ../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 "Henter {0}"
 
-#: ../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 "Kontakter WMS-server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Opret bygninger"
 
-#: ../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"
@@ -11561,30 +11655,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11592,29 +11686,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 ""
 
-#: ../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 "Kun ved vektoriserede lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11623,13 +11717,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"
@@ -11637,5 +11731,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"
@@ -11643,14 +11737,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"
@@ -11658,14 +11752,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"
@@ -11673,64 +11767,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 "Hent lokalitet fra cache (kun hvis cachen er aktiveret)"
 
-#: ../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 "Skift lokalitet"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11738,25 +11832,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11766,14 +11860,14 @@
 msgstr[1] "Forenkl vej (fjern {0} punkter)"
 
-#: ../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 "Tilpas WMS"
 
-#: ../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"
@@ -11781,5 +11875,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
@@ -11787,5 +11881,5 @@
 msgstr "Hent WMS-tern fra {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"
@@ -11793,34 +11887,34 @@
 msgstr ""
 
-#: ../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 "Tomt lag"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11829,18 +11923,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11947,9 +12041,9 @@
 msgstr "Opret kopi af vej"
 
-#: ../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 ""
@@ -11966,11 +12060,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 "Importér rute fra GPX-lag"
 
 #: ../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 "Slet eksisterende rute"
@@ -11980,5 +12074,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 "Intet GPX-datalag blev fundet"
@@ -12188,5 +12282,5 @@
 msgstr "Vis ikke-geotaggede billeder"
 
-#: ../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 "Importerede billeder"
@@ -12609,5 +12703,5 @@
 msgstr "Vinkel mellem to valgte punkter"
 
-#: ../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 ""
@@ -12686,5 +12780,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../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 ""
@@ -12821,7 +12915,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Lag"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12985,43 +13078,41 @@
 msgstr "Indtast vægtede værdier"
 
-#: ../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 ""
 
-#: ../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 "Autozoom: "
-
-#: ../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 "Hent tern"
 
-#: ../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 "Vis status for tern"
-
-#: ../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 "Hent alle tern"
 
-#: ../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 "Øg zoom"
 
-#: ../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 "Reducer zoom"
 
-#: ../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 ""
@@ -13057,7 +13148,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Maks. zoomniveau: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13402,6 +13492,6 @@
 msgstr "Er du sikker?"
 
-#: ../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
@@ -13409,5 +13499,5 @@
 msgstr "Valideringsfejl"
 
-#: ../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 "Ingen valideringsfejl"
@@ -13497,5 +13587,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13595,7 +13685,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Uforbundne veje."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13625,10 +13714,10 @@
 msgstr "Krydsende veje"
 
-#: ../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 "Dublet-punkter"
 
-#: ../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 ""
@@ -13636,9 +13725,9 @@
 "sted."
 
-#: ../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 ""
@@ -13797,80 +13886,80 @@
 #. 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 "Farvelægger problem"
 
-#: ../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 "Nøgle \"{0}\" er ugyldig"
 
-#: ../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 med tomme værdier"
 
-#: ../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 "Ulovlig egenskabsnøgle"
 
-#: ../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 "Ulovligt blanktegn i egenskabsnøgle"
 
-#: ../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 "Egenskabsværdi begynder eller slutter med blanktegn"
 
-#: ../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 "Egenskabsværdi indeholder HTML-kodet tegn"
 
-#: ../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 "Nøglen \"{0}\" er ikke kendt i forudindstillingerne"
 
-#: ../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 "Forudindstillingerne rummer ikke egenskabs-nøglen"
 
-#: ../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 "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne"
 
-#: ../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 "Værdien er ikke kendt i forudindstillingerne"
 
-#: ../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 "FIXMEs"
 
-#: ../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 "Tjek egenskabsnøgler"
 
-#: ../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 "Bekræft egenskabsnøglernes gyldighed op imod en ordliste."
 
-#: ../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 "Brug kompleks egenskabs-tjekker."
 
-#: ../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 ""
 
-#: ../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 "TagChecker-kilde"
 
-#: ../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."
@@ -13878,86 +13967,86 @@
 msgstr ""
 
-#: ../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 "Tilføj en ny kilde til listen."
 
-#: ../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 "Ret den valgte kilde."
 
-#: ../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 "Slet den valgte kilde fra listen."
 
-#: ../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 "Datakilder"
 
-#: ../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 "Tjek egenskabsværdier."
 
-#: ../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 ""
 
-#: ../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 "Tjek for FIXMEs"
 
-#: ../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 "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Brug standard-datafil."
 
-#: ../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 "Brug standard-datafilen (anbefales)."
 
-#: ../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 "Brug standard-fil for stavekontrol."
 
-#: ../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 "Brug standard-filen for stavekontrol (anbefales)."
 
-#: ../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 "Ret egenskaber"
 
-#: ../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 "Kunne ikke finde element-typen"
 
-#: ../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 "Kunne ikke finde advarsels-niveau"
 
-#: ../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 "Ugyldigt udtryk ''{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}''"
@@ -14133,17 +14222,17 @@
 "Denne test undersøger om en vej har et slutpunkt meget tæt på en anden vej."
 
-#: ../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 "Vejens slutpunkt tæt på anden landevej."
 
-#: ../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 "Vejens slutpunkt nær anden vej."
 
-#: ../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 "Vejpunkt tæt på anden vej"
 
-#: ../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 "Forbundet vejs slutpunkt tæt på anden vej"
@@ -14194,13 +14283,13 @@
 msgstr "Denne test tjekker retningen for vand-, land- og kystlinje-veje."
 
-#: ../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 "Modsatrettet kystlinje: Der er ikke land på venstre side"
 
-#: ../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 "Modsatrettet vand: Der er ikke land på venstre side"
 
-#: ../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 "Modsatrettet land: Der er ikke land på venstre side"
@@ -14236,7 +14325,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-lag ({0}), henter til zoom {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14244,18 +14333,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 "Hent"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Hent kort-data fra OSM serveren."
+
+#: ../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>Der er ingen lag, kildelaget<br>\"{0}\"<br>kunne flettes sammen med.</"
+"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 "Dublet-punkter"
+
+#: ../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 ""
 
@@ -14263,43 +14396,4 @@
 msgid "Exception occurred"
 msgstr "En undtagelse opstod"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "hjælp"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Hjælp / Om"
-
-#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14401,28 +14495,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatisk download"
 
-#: ../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-lag ({0}), henter automatisk til zoom {1}"
 
-#: ../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-lag ({0}), henter til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14433,13 +14527,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"
@@ -14448,42 +14542,42 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Hent synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Hent WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Hent WMS-lag"
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Fil format fejl"
@@ -18922,14 +19016,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Arkæologisk sted"
+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 "Ret arkæologisk sted"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26898,42 +26990,226 @@
 msgstr ""
 
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Der er ingen primitiver med versionen {0} i denne historik"
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Fandt ikke en primitiv med id {0} i dette datasæt"
+
+#~ msgid "help"
+#~ msgstr "hjælp"
+
+#~ msgid "Help / About"
+#~ msgstr "Hjælp / Om"
+
+#~ msgid "Move"
+#~ msgstr "Flyt"
+
+#~ msgid "No data imported."
+#~ msgstr "Intet data importeret."
+
 #~ msgid "File could not be found."
 #~ msgstr "Filen kunne ikke findes."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Vælg mindst én opgave til download"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload til OSM-API'et fejlede"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Modstridende relation"
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM "
+#~ "fra, om problemet."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv "
+#~ "igen om kort tid."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Fandt <nd>-element i en ikke-vej"
+
+#~ msgid "Unknown version"
+#~ msgstr "Ukendt version"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har nul ref"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Kontakter OSM-serveren..."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Tags (tom værdi fjerner tag)"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Tilføj alle valgte objekter som medlemmer"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Fejl i fortolkning af server-svar."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Der var konflikter ved import."
+
+#~ msgid "Revert"
+#~ msgstr "Tilbagefør"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan ikke forbinde til serveren."
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Sammenfletnings-konflikter."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Udred konflikter"
+
+#~ msgid "name"
+#~ msgstr "navn"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-brugernavn (e-mail)"
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Udvidelsen findes allerede"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] ""
+#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM."
+#~ msgstr[1] ""
+#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM."
+
+#~ msgid "their version:"
+#~ msgstr "deres udgave:"
 
 #~ msgid "Error while parsing"
 #~ msgstr "Fejl ved fortolkning"
 
+#~ msgid "resolved version:"
+#~ msgstr "udredet udgave:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objekt har konflikter:"
+#~ msgstr[1] "{0} objekter har konflikter:"
+
+#~ msgid "my version:"
+#~ msgstr "min udgave:"
+
 #~ msgid "File not found"
 #~ msgstr "Filen blev ikke fundet"
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Indtast venligst først de ønskede koordinater."
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Løs {0} konflikter i {1} objekter"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Slet {1} {0}"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "anderledes"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sand"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Fejl ved indlæsning af siden {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Åbn i browser"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM Online-hjælp"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Sammensæt veje med forskellige tilhørsforhold?"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk "
+#~ "sammensætte dem?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alle vejene var tomme"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "unnamed"
+#~ msgstr "unavngivet"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Intet dokument er åbent, så der er intet at gemme."
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Nogle af punkterne er (næsten) på linjen"
 
 #~ msgid "Select a bookmark first."
 #~ msgstr "Vælg først et bogmærke"
 
+#~ msgid "Occupied By"
+#~ msgstr "Optaget af"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
+
 #~ msgid "Please enter a search string"
 #~ msgstr "Indtast venligst en søgestreng"
 
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan ikke læse sted søgnings resultat fra serveren"
-
-#~ msgid "name"
-#~ msgstr "navn"
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importér TCX-fil som GPS-spor"
 
 #~ msgid "zoom"
 #~ msgstr "zoom"
 
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vælg venligst rækken, som skal kopieres."
+#~ msgid "Import TCX File..."
+#~ msgstr "Importér TCX-fil..."
+
+#~ msgid "Validate"
+#~ msgstr "Validér"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
+
+#~ msgid "Request Update"
+#~ msgstr "Anmod om opdatering"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Ugemte ændringer"
 
 #~ msgid ""
@@ -26944,202 +27220,6 @@
 #~ "rette i indstillingen 'pluginmanager.warntime'.)"
 
-#~ msgid "Request Update"
-#~ msgstr "Anmod om opdatering"
-
-#~ msgid "error loading metadata"
-#~ msgstr "fejl ved indlæsning af metaoplysninger"
-
-#~ msgid "requested: {0}"
-#~ msgstr "anmodet: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "fejl ved anmodning af opdatering"
-
-#~ msgid "Move"
-#~ msgstr "Flyt"
-
-#~ msgid "No data imported."
-#~ msgstr "Intet data importeret."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM "
-#~ "fra, om problemet."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv "
-#~ "igen om kort tid."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Fandt <nd>-element i en ikke-vej"
-
-#~ msgid "Unknown version"
-#~ msgstr "Ukendt version"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nul ref"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontakter OSM-serveren..."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tags (tom værdi fjerner tag)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Tilføj alle valgte objekter som medlemmer"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fejl i fortolkning af server-svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Der var konflikter ved import."
-
-#~ msgid "Revert"
-#~ msgstr "Tilbagefør"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan ikke forbinde til serveren."
-
-#~ msgid "Date"
-#~ msgstr "Dato"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Sammenfletnings-konflikter."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Udred konflikter"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-brugernavn (e-mail)"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Udvidelsen findes allerede"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM."
-#~ msgstr[1] ""
-#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM."
-
-#~ msgid "their version:"
-#~ msgstr "deres udgave:"
-
-#~ msgid "resolved version:"
-#~ msgstr "udredet udgave:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekter har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min udgave:"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Løs {0} konflikter i {1} objekter"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Slet {1} {0}"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "anderledes"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sand"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fejl ved indlæsning af siden {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Åbn i browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online-hjælp"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sammensæt veje med forskellige tilhørsforhold?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk "
-#~ "sammensætte dem?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle vejene var tomme"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "unnamed"
-#~ msgstr "unavngivet"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Intet dokument er åbent, så der er intet at gemme."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Nogle af punkterne er (næsten) på linjen"
-
-#~ msgid "Occupied By"
-#~ msgstr "Optaget af"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importér TCX-fil som GPS-spor"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importér TCX-fil..."
-
-#~ msgid "Validate"
-#~ msgstr "Validér"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Ugemte ændringer"
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Indtast venligst først de ønskede koordinater."
 
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
@@ -27188,4 +27268,7 @@
 #~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider."
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Modstridende relation"
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -27226,6 +27309,18 @@
 #~ msgstr "Send til OSM..."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Vælg mindst én opgave til download"
+
 #~ msgid "Empty member in relation."
 #~ msgstr "Tomt medlem i relation."
+
+#~ msgid "requested: {0}"
+#~ msgstr "anmodet: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "fejl ved indlæsning af metaoplysninger"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vælg venligst rækken, som skal kopieres."
 
 #~ msgid "Please choose a user using the author panel"
@@ -27271,4 +27366,7 @@
 #~ msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter."
 
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan ikke læse sted søgnings resultat fra serveren"
+
 #~ msgid "Basic"
 #~ msgstr "Grundlæggende"
@@ -27320,4 +27418,7 @@
 #~ msgid "Update Data"
 #~ msgstr "Opdater data"
+
+#~ msgid "error requesting update"
+#~ msgstr "fejl ved anmodning af opdatering"
 
 #~ msgid "Continue anyway"
@@ -27502,4 +27603,7 @@
 #~ msgstr "Der er opdaget en konflikt"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload til OSM-API'et fejlede"
+
 #~ msgid "Primitive already deleted"
 #~ msgstr "Primitiven er allerede slettet"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 18508)
+++ applications/editors/josm/i18n/po/de.po	(revision 18656)
@@ -1,3 +1,2 @@
-# translation of de.po to Deutsch
 # translation of de.po to
 #
@@ -9,13 +8,13 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-08 14:50+0100\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-17 17:19+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
-"Language-Team: Deutsch\n"
+"Language-Team:  <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:04+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -48,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
@@ -69,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
@@ -76,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
@@ -95,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"
@@ -121,6 +120,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
@@ -136,7 +135,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
@@ -147,7 +146,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
@@ -173,12 +172,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
@@ -190,6 +189,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 "Fehler"
@@ -210,6 +210,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"
@@ -322,5 +322,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
@@ -338,6 +338,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
@@ -348,5 +348,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
@@ -469,5 +469,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
@@ -509,5 +509,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
@@ -516,6 +516,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"
@@ -703,5 +704,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
@@ -714,5 +715,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"
@@ -784,5 +785,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
@@ -790,28 +799,28 @@
 msgstr "Parameter ''{0}'' darf nicht null sein"
 
-#: ../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 "Es traten {0} Konflikte während des Imports auf."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikte beim Herunterladen"
 
-#: ../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 "({0}/{1}) Eltern des Knotens {2} laden"
 
-#: ../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 "({0}/{1}) Eltern des Wegs {2} laden"
 
-#: ../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}"
@@ -848,10 +857,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 "Als GPX exportieren..."
 
 #: ../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 "Die Daten ins GPX-Format exportieren."
@@ -864,11 +873,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
@@ -899,5 +907,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
@@ -912,17 +919,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
@@ -982,5 +990,5 @@
 msgstr "Einen Knotenpunkt an der nächsten Stelle in den Weg einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Knotenpunkt und Linie vereinigen"
@@ -1011,20 +1019,20 @@
 msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr "Vereinigen abbrechen"
+
+#: ../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
+msgstr "Klicken, um das Vereinigen abzubrechen"
+
+#: ../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 ""
-"Kann Knotenpunkte nicht vereinigen: Ein Weg, der noch verwendet wird, müsste "
-"gelöscht werden."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+"Die Knoten können nicht vereinigt werden. Dafür müsste der zurzeit noch "
+"benutzte Weg ''{0}'' gelöscht werden."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1317,10 +1325,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 "Speichern"
 
 #: ../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 "Aktuelle Daten speichern."
@@ -1377,10 +1385,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 "Speichern unter..."
 
 #: ../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 "Aktuelle Daten in einer neuen Datei speichern."
@@ -1422,25 +1430,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 "Schließen"
 
-#: ../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 aufspalten"
 
-#: ../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 "Weg am gewählten Knotenpunkt aufspalten."
 
-#: ../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 "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden."
 
-#: ../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."
@@ -1448,5 +1456,5 @@
 msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges."
 
-#: ../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 "
@@ -1462,9 +1470,9 @@
 "Bitte auch den Weg auswählen."
 
-#: ../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 "Die gewählten Punkte gehören nicht zum selben Weg."
 
-#: ../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."
@@ -1472,6 +1480,6 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../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 ""
@@ -1479,5 +1487,5 @@
 "trennen zu können."
 
-#: ../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 "
@@ -1487,5 +1495,5 @@
 "in der Mitte des Weges.)"
 
-#: ../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 "
@@ -1495,5 +1503,5 @@
 "kopiert.<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
 
-#: ../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 "
@@ -1503,5 +1511,5 @@
 "sollten dies überprüfen und falls nötig korrigieren.</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"
@@ -1531,33 +1539,33 @@
 msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden."
 
-#: ../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 "Dieser Knoten ist mit nichts verbunden."
 
-#: ../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 "Keiner dieser Knoten ist mit anderen Elementen verbunden."
 
-#: ../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 "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
 
-#: ../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 "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Bitte wählen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Ein Knoten mit Merkmalen, oder"
 
-#: ../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 "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder"
 
-#: ../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 ""
@@ -1565,5 +1573,5 @@
 "oder"
 
-#: ../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"
 msgstr ""
@@ -1571,5 +1579,5 @@
 "verwendet werden, oder"
 
-#: ../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."
 msgstr ""
@@ -1577,5 +1585,5 @@
 "werden."
 
-#: ../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"
@@ -1589,9 +1597,9 @@
 "und alle Knoten werden ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Knotenpunkte getrennt"
 
-#: ../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"
@@ -1599,5 +1607,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"
@@ -1644,5 +1652,5 @@
 #.
 #: ../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 "Daten herunterladen"
@@ -1658,5 +1666,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+msgid "Update selection"
 msgstr "Auswahl aktualisieren"
 
@@ -1672,5 +1680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+msgid "There are no selected objects to update."
 msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt."
 
@@ -1678,4 +1686,8 @@
 msgid "Selection empty"
 msgstr "Auswahl leer"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+msgid "Update objects"
+msgstr "Objekte aktualisieren"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1846,6 +1858,6 @@
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe "
-"dieses Objekt beim Hochladen."
+"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe dieses "
+"Objekt beim Hochladen."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
@@ -1974,9 +1986,9 @@
 msgstr "Heruntergeladene GPS-Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Daten herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid "Ignoring exception because download has been cancelled. Exception was: {0}"
@@ -1985,5 +1997,5 @@
 "Fehlermeldung war: {0}"
 
-#: ../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 "In diesem Gebiet wurden keine Daten gefunden."
@@ -1999,16 +2011,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Sichtbar (auf Server)"
+msgstr "Auf dem Server überprüfen"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server "
-"bereits gelöscht ist."
+"Klicken, um zu überprüfen ob Objekte in Ihren lokalen Daten auf dem Server "
+"gelöscht sind"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2067,5 +2077,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
@@ -2098,6 +2108,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 "Ausgewählt"
@@ -2115,26 +2125,26 @@
 msgstr "Knotenpunkt in einen Weg einfügen"
 
-#: ../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 "Existierenden Weg mit Knotenpunkt verbinden"
 
-#: ../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 "Einen Knotenpunkt in einen bestehenden Weg einfügen"
 
-#: ../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 "Knotenpunkt in einen Weg einfügen und 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 "Einen neuen Knoten erstellen."
 
-#: ../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 "Knoten unter Mauszeiger wählen."
 
-#: ../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."
@@ -2143,46 +2153,44 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../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 "Neuen Weg an letztem Knoten beginnen."
 
-#: ../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 am letzten Knoten fortsetzen."
 
-#: ../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 "Zeichnen beenden."
 
-#: ../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 "Ausziehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Gebiete erstellen"
 
-#: ../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 ausziehen"
 
-#: ../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 "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
-#: ../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 "Maustaste loslassen, um das Drehen zu 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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen."
 
@@ -2242,4 +2250,8 @@
 msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2247,4 +2259,8 @@
 "Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten "
 "Punkt vereinigen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Maustaste loslassen, um das Drehen zu stoppen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2274,51 +2290,54 @@
 "runter, rechts; Zoom verschieben mit rechter Maus"
 
-#: ../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 "Suchen..."
 
-#: ../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 "Nach Objekten suchen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Es kann nicht gesucht werden, da keine Daten geladen sind."
-
-#: ../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 "Bitte einen Filterbegriff eingeben:"
 
-#: ../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 "Bitte einen Suchbegriff eingeben."
 
-#: ../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 "Regulärer Ausdruck"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: ../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 "zur Auswahl hinzufügen"
 
-#: ../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 "aus der Auswahl entfernen"
 
-#: ../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 "in der Auswahl suchen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: ../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 ""
@@ -2326,17 +2345,17 @@
 "Namen."
 
-#: ../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>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder Namen."
 
-#: ../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:Ber</b> - 'Ber' irgendwo im Namen."
 
-#: ../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> - Schlüssel 'type' mit exakt dem Wert '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>, "
@@ -2346,55 +2365,57 @@
 "<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:Ber</b> - kein 'Ber' im Namen."
 
-#: ../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> - Schlüssel=foot mit beliebigem Wert."
 
-#: ../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>Spezialsuchen:</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> - Typ des Objektes (<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>user:</b>... - Alle von diesem Nutzer geänderten Objekte"
 
-#: ../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 "<b>id:</b>... - Objekte mit der angegebenen ID (0 für neue Objekte)"
 
-#: ../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>... - Objekte mit gegebener Knotenanzahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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>tags:</b>... - Objekte mit gegebener Merkmalsanzahl (<b>tags: anzahl</b> oder <b>tags: min-max</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgstr ""
+"<b>tags:</b>... - Objekte mit gegebener Merkmalsanzahl (<b>tags: anzahl</b> "
+"oder <b>tags: min-max</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Alle geänderten Objekte"
 
-#: ../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 ausgewählten Objekte"
 
-#: ../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 unvollständigen Objekte"
 
-#: ../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>untagged</b> - Alle Objekte ohne Merkmale"
 
-#: ../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 ""
@@ -2402,5 +2423,5 @@
 "Ausdrucks"
 
-#: ../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 ""
@@ -2408,17 +2429,17 @@
 "Ausdrucks"
 
-#: ../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 "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
-#: ../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 "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
 
-#: ../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 "Nutzung von <b>(</b> und <b>)</b> zum Gruppieren von Ausdrücken."
 
-#: ../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
@@ -2428,51 +2449,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 "Suche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Filter bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Suche starten"
 
-#: ../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 "Nichts gefunden für Suche ''{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 "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''"
 
-#: ../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 "Nichts aus der Auswahl entfernt durch Suche ''{0}''"
 
-#: ../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 "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden."
 
-#: ../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} Treffer gefunden"
 
-#: ../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"
@@ -2658,6 +2679,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
@@ -2786,5 +2807,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 "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -2811,7 +2832,14 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+msgid "At least one object to delete required, got empty collection"
+msgstr ""
+"Mindestens ein Objekt zum Löschen wurde erwartet, es wurde jedoch eine leere "
+"Menge erhalten"
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
 msgid "At least one object to delete requird, got empty collection"
 msgstr ""
+"Mindestens ein Objekt zum Löschen wurde erwartet, es wurde jedoch eine leere "
+"Menge erhalten"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
@@ -2844,5 +2872,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 "Wegabschnitt aufspalten"
@@ -2850,6 +2878,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."
@@ -2861,5 +2889,5 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Löschbestätigung"
@@ -2870,5 +2898,15 @@
 msgstr "Konflikte im Löschstatus für {0} auflösen"
 
-#: ../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"
@@ -2953,5 +2991,5 @@
 msgstr "{0} Merkmalskonflikte in Relation {1} auflösen"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3051,15 +3089,21 @@
 #, java-format
 msgid "Expected array of length 4, got {0}"
-msgstr ""
+msgstr "Array der Länge 4 erwartet, aber {0} erhalten"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
 #, java-format
 msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+msgstr "Genau zwei Gleitkommawerte in der Zeichenkette erwartet, jedoch {0} erhalten"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
 #, java-format
 msgid "Illegal double value ''{0}''"
 msgstr "Ungültiger Gleitkommawert ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3156,5 +3200,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3162,4 +3206,6 @@
 msgid "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Fehler: Unzulässiger Wert ''{0}'' vom Typ double in der Zeile ''{1}'' der "
+"Lesezeichen-Datei ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -3180,5 +3226,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
+msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
@@ -3188,4 +3234,6 @@
 "server"
 msgstr ""
+"Fehler: Unzulässiger Gleitkommawert ''{0}'' in der Zeile ''{1}'' der Liste "
+"der Lesezeichen vom Server"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
@@ -3199,9 +3247,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Die Lesezeichen konnten aus Sicherheitsgründen nicht von ''{0}'' geladen "
-"werden. Die Ausnahme lautet: {1}"
+msgstr "Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3214,8 +3260,10 @@
 msgid "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Warnung: unerwartete Versionsnummer für JOSM in der Versions-Datei, der Wert "
+"ist ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Warnung: die Versions-Datei ''/REVISION'' fehlt"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
@@ -3259,5 +3307,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
@@ -3269,6 +3317,8 @@
 msgid "Unable to add primitive {0} to the dataset because it's already included"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+"Objekt {0} kann nicht zum Datensatz hinzugefügt werden, weil es bereits im "
+"Datensatz enthalten ist"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3277,4 +3327,46 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM erwartet das Objekt [{0} {1}] im Datensatz zu finden, aber es ist dort "
+"nicht vorhanden. Bitte melden Sie dies unter http://josm.openstreetmap.de. "
+"Es handelt sich nicht um einen kritischen Fehler. Sie sollten die Arbeit mit "
+"JOSM fortsetzen können."
+
+#: ../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 "Fehlendes Argument für 'NICHT'."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Versionsprotokoll für Relation {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in "
+"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. "
 
 #. translators notes must be in front
@@ -3331,33 +3423,33 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Fehler: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warnung: {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 "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../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 "Ein Objekt mit ID=0 darf nicht unsichtbar sein"
 
-#: ../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 "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../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 "Version > 0 erwartet, jedoch {0} erhalten."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3385,45 +3477,28 @@
 "Schlüssel mit mehreren Werten enthält"
 
-#: ../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 "Knoten \"{0}\" konnte nicht zu unvollständigem Weg \"{1}\" hinzufügt werden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "Es gibt kein Objekt mit der Version \"{0}\" in der Objekt-Geschichte."
-
-#: ../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 "Es wurde kein Objekt in der Geschichte für das Datum {0} gefunden."
-
-#: ../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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected, got {1}"
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "Der Parameter \"{0}\" muss im Bereich 0 bis {1} liegen, ist aber \"{2}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "Keine \"älteste\" Version gefunden. Es existiert keine Geschichte."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "Keine \"neueste\" Version gefunden. Es existiert keine Geschichte."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr "Typ nicht gefunden. Es existiert keine Geschichte."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden"
-
-#: ../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 "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden"
-
-#: ../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
@@ -3434,9 +3509,10 @@
 msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
 
-#: ../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 ""
 "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
-"verglichen werden"
+"verglichen werden."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -3446,147 +3522,145 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../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 "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../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 "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../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 "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../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}'' mit weniger als zwei Knoten."
 
-#: ../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 "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../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 "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../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 "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../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 "Unbekannte Role \"{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 "Unbekannter Elementtyp für \"{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 "Kein \"from\"-Weg gefunden."
 
-#: ../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 "Kein \"to\"-Weg gefunden."
 
-#: ../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 "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../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 "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"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 "Der \"from\"-Weg beginnt oder endet nicht an dem \"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 "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../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 "Die Wege ''{0}'' und {1}'' kreuzen sich."
 
-#: ../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 "Innerer Weg \"{0}\" ist außerhalb."
 
-#: ../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 "\"{0}\" ist keine sinnvolle Rolle für den 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 "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../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 "Kein äußerer Weg im Multipolygon ''{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 "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../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 "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../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 "Ohne Merkmale"
 
-#: ../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 "Text"
 
-#: ../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 "Flächentext"
 
-#. 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 ""
-"Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es in "
-"der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin behalten. "
-
-#: ../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 "Fehler: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warnung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "Inaktiv"
 
-#: ../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
@@ -3596,5 +3670,5 @@
 msgstr[1] "Knotenpunkte"
 
-#: ../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
@@ -3604,6 +3678,6 @@
 msgstr[1] "Wege"
 
-#: ../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
@@ -3613,13 +3687,13 @@
 msgstr[1] "Relationen"
 
-#: ../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 "Weg ohne Merkmale"
 
-#: ../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 "Unvollständiger 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
@@ -3627,5 +3701,5 @@
 msgstr "Hintergrund"
 
-#: ../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 "Hervorgehoben"
@@ -3711,5 +3785,5 @@
 msgstr "Nicht noch einmal zeigen"
 
-#: ../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
@@ -3717,32 +3791,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 "unvollständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "Straße"
 
-#: ../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 "Eisenbahn"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "Gewässer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "Landfläche"
 
-#: ../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"
@@ -3751,5 +3825,5 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3758,33 +3832,33 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Vorbedingung nicht erfüllt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Sicherheitsausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Netzwerkausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "Ein-/Ausgabefehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Fehlerhafte Anfrage"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../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
@@ -3792,9 +3866,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Objekt gelöscht"
@@ -4020,5 +4094,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 "Bearbeiten"
@@ -4146,10 +4220,10 @@
 msgstr "Nutzer:"
 
-#: ../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 "Ebene nicht in der Liste."
 
-#: ../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"
@@ -4157,7 +4231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Nein, Operation abbrechen"
+msgstr "Klicken Sie um die aktuelle Aufgabe abzubrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4208,4 +4281,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Bitte bestätigen Sie, dass <strong>{0} Objekte</strong> aus <strong>"
+"{1} Relationen</strong> entfernt werden sollen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
@@ -4286,5 +4361,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"
@@ -4293,5 +4368,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"
@@ -4301,5 +4376,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 "Elemente"
@@ -4754,5 +4829,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 "Nein, abbrechen"
@@ -4817,6 +4892,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 "<undefiniert>"
@@ -4945,4 +5018,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"
@@ -5041,5 +5115,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"
@@ -5050,5 +5124,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"
@@ -5068,10 +5142,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep"
-msgstr ""
+msgstr "Behalten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Lösche dieses Miglied aus der Relation."
+msgstr "Behalte dieses Relations-Mitglied für das Ziel-Objekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5095,5 +5168,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
 msgid "Tag modified relations with "
-msgstr "Kennzeichnen der geänderten Relationen mit  "
+msgstr "Kennzeichnen der geänderten Relationen mit "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5109,7 +5182,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5138,4 +5210,10 @@
 "original node in the membership.</html>"
 msgstr ""
+"<html>Die vereinigten Knoten sind Mitglieder in mindestens einer Relation. "
+"Bitte entscheiden Sie, ob Sie diese Relationen-Mitgliedschaften "
+"<strong>behalten</strong> oder <strong>entfernen</strong> wollen.<br>Die "
+"Grundeinstellung ist <strong>behalten</strong>: der vereinigte Knoten nimmt "
+"den Platz der ursprünglichen Knoten in den Relation-Mitgliedschaften ein.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
@@ -5177,5 +5255,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
@@ -5276,5 +5354,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"
@@ -5330,11 +5408,11 @@
 msgstr "Versionsprotokoll aller gewählten Objekte anzeigen."
 
-#: ../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 "Objekt mit Geschichte"
 
-#: ../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
@@ -5342,13 +5420,13 @@
 msgstr "Neu laden"
 
-#: ../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 ausgewählten Objekte neu laden und die Liste aktualisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../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 "Geschichte der markierten Elemente anzeigen."
@@ -5407,13 +5485,12 @@
 
 #: ../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."
+#, java-format
+msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] "Damit wird maximal {0} Objekt geändert."
+msgstr[0] "Damit wird {0} Objekt geändert."
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "An empty value deletes the key."
+msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
@@ -5438,4 +5515,11 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
+#: ../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] "Damit wird maximal {0} Objekt geändert."
+msgstr[1] "Damit werden maximal {0} Objekte geändert."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5512,33 +5596,33 @@
 #. 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 "Relationen"
 
-#: ../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 "Eine Liste aller Relationen öffnen."
 
-#: ../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 "Relationen: {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 "Editor für die gewählte Relation öffnen"
 
-#: ../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 "Gewählte Relation löschen"
 
-#: ../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 "Eine neue Relation erstellen"
 
-#: ../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"
@@ -5547,24 +5631,21 @@
 "öffnen."
 
-#: ../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 "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
 
-#: ../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 "Gewählte Relation löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
-#, fuzzy
+msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
 msgid "Select members"
-msgstr "Bitte wählen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
-#, fuzzy
+msgstr "Mitglieder auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
-msgstr "Ausgewählte Verknüpfungen herunter laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+msgstr "Alle Mitglieder der ausgewählten Relationen laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
 msgstr "Elemente herunterladen"
@@ -5729,5 +5810,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}"
@@ -5992,14 +6073,14 @@
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
 
-#: ../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 "Zoomen auf"
 
-#: ../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"
+#: ../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 "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
@@ -6007,5 +6088,5 @@
 "ist"
 
-#: ../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 "Zoom ist deaktiviert, weil kein Element ausgewählt wurde"
@@ -6028,5 +6109,5 @@
 msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
 
-#: ../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}"
@@ -6102,5 +6183,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
 msgid "<html>There is currently no download area selected.</html>"
-msgstr ""
+msgstr "<html>Es ist kein Ladebereich ausgewählt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6110,4 +6191,6 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
+"<html><strong>Aktueller Ladebereich</strong> (min. Breite, min. Länge, max. "
+"Br., max. Län.): {0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
@@ -6116,17 +6199,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Die ausgewählte Relation bearbeiten"
+msgstr "Fügen Sie ein Lesezeichen für den aktuellen Ladebereich hinzu"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 msgid "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"Es ist kein Ladebereich ausgewählt. Bitte wählen Sie zunächst einen Bereich "
+"aus."
 
 #: ../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 "Bitte geben Sie einen Namen für den Ort an."
+msgstr "Bitte geben Sie einen Namen für das Lesezeichen ein."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6136,12 +6219,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Ausgewählte Elemente nach oben schieben"
+msgstr "Entfernt die ausgewählten Lesezeichen"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Ausgewählte Elemente nach oben schieben"
+msgstr "Benennt das ausgewählte Lesezeichen um"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6177,17 +6258,17 @@
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
-msgstr ""
+msgstr "Die Zeichenkette ''{0}'' ist kein gültiger Gleitkommawert."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Als Breitengrad wird ein Wert im Intervall [-90,90] erwartet."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "AlsLängengrad wird ein Wert im Intervall  [-180,180] erwartet."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "URL aus der Zwischenablage einfügen"
 
 #. adding the download tasks
@@ -6201,7 +6282,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Weg am gewählten Knotenpunkt aufspalten."
+msgstr "Auswählen, um OSM-Datenobjekte im ausgewählten Ladebereich zu laden."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6210,7 +6290,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Der gewählte Weg enthält nicht den gewählten Punkt."
+msgstr "Auswählen, um GPS-Spuren im ausgewählten Ladebereich zu laden."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6223,4 +6302,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Auswählen, um Daten in eine neue Ebene zu laden.<br>Auswahl entfernen, "
+"um in die aktuelle Daten-Ebenen zu laden.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -6250,12 +6331,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Die ausgewählte Relation bearbeiten"
+msgstr "Klicken, um den aktuellen Ladebereich zu laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
+msgstr "Bitte wählen Sie zunächst einen Ladebereich aus."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6265,4 +6344,7 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>Weder <strong>{0}</strong> noch <strong>{1}</strong> ist ausgewählt."
+"<br>Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder beides laden "
+"wollen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
@@ -6276,5 +6358,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Ladebereich um bestimmte Orte"
 
 #. SAXException does not chain correctly
@@ -6288,15 +6370,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Richtung, in der nach Land gesucht werden soll"
+msgstr "Klicken, um die Suche nach Orten zu starten"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
 msgid "Querying name server"
-msgstr ""
+msgstr "Suche nach Namen"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Suche nach Namen ..."
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7268,5 +7349,5 @@
 msgstr "JOSM-Hilfeanzeiger"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7288,5 +7369,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
 #, java-format
 msgid ""
@@ -7301,5 +7382,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
 #, java-format
 msgid ""
@@ -7310,19 +7391,19 @@
 "<br>Vermutlich ist Ihre Internet-Verbindung unterbrochen.</html>"
 
-#: ../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 "Die URL konnte nicht geöffnet werden"
 
 #. 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 "Aktuelle Hilfeseite in einem externen Browser öffnen"
 
 #. 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 "Die aktuelle Hilfeseite bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7330,34 +7411,36 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
+"<html>Die aktuelle URL <tt>{0}</tt><br>ist eine externe URL. Änderungen sind "
+"nur möglich für Hilfe-Themen<br>auf dem Hilfe-Server<tt>{1}</tt>.</html>"
 
 #. 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 "Die aktuelle Hilfeseite neu laden"
 
 #. 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 "Zur vorherigen Seite gehen"
 
 #. 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 "Zur nächsten Seite gehen"
 
 #. 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 "Gehe zur Start-Seite für die JOSM-Hilfe"
 
-#: ../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
+msgstr "Warnung: Falsche Position im HTML Dokument. Der Fehler war: "
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
 msgid "Failed to open help page. The target URL is empty."
 msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer."
 
-#: ../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 "Die Hilfe-Seite konnte nicht geladen werden"
@@ -7366,4 +7449,6 @@
 msgid "Failed to read command. Exiting help browser. Exception was:"
 msgstr ""
+"Ein Kommando konnte nicht gelesen werden. Der Hilfe-Browser wird "
+"geschlossen. Die Fehermeldung war:"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
@@ -7379,32 +7464,32 @@
 msgstr "Länge: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr "Koordinaten"
 
-#: ../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 "Versionsprotokoll für Knoten {0}"
 
-#: ../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 "Versionsprotokoll für Weg {0}"
 
-#: ../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 "Versionsprotokoll für Relation {0}"
 
-#: ../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 "Dialog schließen"
 
-#: ../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 "Versionsprotokoll erneut vom Server laden"
 
-#: ../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 ""
@@ -7412,6 +7497,6 @@
 "Referenzelements."
 
-#: ../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 "Failed to set reference. Reference ID {0} does not match history ID {1}."
@@ -7420,5 +7505,5 @@
 "Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid "Failed to set reference. Reference version {0} not available in history."
@@ -7427,5 +7512,5 @@
 "der Geschichte nicht vorhanden."
 
-#: ../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 ""
@@ -7433,5 +7518,5 @@
 "aktuellen Elements."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7440,24 +7525,34 @@
 msgstr "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Versionsprotokoll laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
 
-#: ../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 "Versionsprotokoll für Knoten {0} laden"
 
-#: ../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 "Versionsprotokoll für Weg {0} laden"
 
-#: ../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}"
@@ -7470,4 +7565,20 @@
 msgstr "Knoten {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+msgid "Zoom to node"
+msgstr "Zoom auf Knoten"
+
+#: ../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
+msgid "Show history"
+msgstr "Versionsprotokoll anzeigen"
+
+#: ../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
@@ -7480,16 +7591,63 @@
 msgstr "Relation {0}"
 
-#: ../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
+msgid "not present"
+msgstr "nicht vorhanden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Nutzer"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr "Änderungssatz"
 
-#: ../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 "unbekannt"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+
+#: ../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 "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+msgid "anonymous"
+msgstr "anonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7514,4 +7672,18 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} erzeugt am {1} von {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, java-format
+msgid "Version {0} in editor"
+msgstr "Version {0} im Editor"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+msgid "[deleted]"
+msgstr "[gelöscht]"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Version {0} erzeugt am {1} von {2}"
 
@@ -7972,13 +8144,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 "Liste Ihrer offenen Änderungssätze vom Server laden"
 
-#: ../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 "Ausgewählten offenen Änderungssatz schließen"
 
-#: ../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
@@ -8051,5 +8223,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}..."
@@ -8061,5 +8233,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 "Georeferenzierte Bilder"
@@ -8085,5 +8257,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"
@@ -8138,43 +8310,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-Punkt"
 
 #: ../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 "Linienaussehen anpassen"
 
 #: ../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 "Globale Einstellungen verwenden."
 
 #: ../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 "Linien zwischen Punkten dieser Ebene zeichnen."
 
 #: ../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 "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
 #: ../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 "Linienaussehen wählen"
 
 #: ../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 "Farben anpassen"
 
 #: ../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"
@@ -8182,6 +8354,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"
@@ -8271,10 +8443,10 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../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 "Zur Daten-Ebene konvertieren"
 
-#: ../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."
@@ -8284,43 +8456,43 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../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 "Konvertiert von: {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 "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../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 im Bereich herunterladen:"
 
-#: ../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} Meter"
 
-#: ../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 "Maximalgebiet je Anfrage:"
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8331,5 +8503,5 @@
 "fortfahren?</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 ""
@@ -8337,5 +8509,5 @@
 "werden kann."
 
-#: ../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 "
@@ -8345,5 +8517,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../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 "
@@ -8379,5 +8551,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8388,12 +8560,14 @@
 "server."
 msgstr[0] ""
-"{0} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server "
-"bereits gelöscht ist."
+"{0} Konflikt wurde <strong>automatisch aufgelöst</strong> indem {0} "
+"Objekt<br> aus dem lokalen Datensatz entfernt wurde,  weil es bereits auf "
+"dem Server gelöscht wurde."
 msgstr[1] ""
-"{0} Objekte wurden aus den lokalen Daten entfernt, weil sie auf dem Server "
-"bereits gelöscht sind."
+"{0} Konflikte wurden <strong>automatisch aufgelöst</strong> indem {0} "
+"Objekte<br> aus dem lokalen Datensatz entfernt wurden,  weil sie bereits auf "
+"dem Server gelöscht wurden."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8402,6 +8576,10 @@
 "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
 "Dialog and manually resolve them."
-msgstr[0] "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
-msgstr[1] "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
+msgstr[0] ""
+"{0} Konflikt muss noch gelöst werden.<br><br>Bitte öffen Sie den Konflikt-"
+"Dialog und lösen Sie ihn manuell."
+msgstr[1] ""
+"{0} Konflikte müssen noch gelöst werden.<br><br>Bitte öffen Sie den Konflikt-"
+"Dialog und lösen Sie sie manuell."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
@@ -8409,7 +8587,7 @@
 msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java: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"
@@ -8418,24 +8596,24 @@
 msgstr[1] "{0} gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../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-Version: {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 "Zu GPX-Ebene konvertieren"
 
-#: ../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."
@@ -8445,5 +8623,5 @@
 "<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8452,5 +8630,5 @@
 msgstr[1] "GPS-Spuren"
 
-#: ../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"
@@ -8458,5 +8636,5 @@
 msgstr[1] "Punkte"
 
-#: ../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"
@@ -8465,5 +8643,5 @@
 msgstr[1] "Eine GPS-Spur mit {0} Punkten"
 
-#: ../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"
@@ -8472,5 +8650,5 @@
 msgstr[1] "{0} besteht aus {1} GPS-Spuren"
 
-#: ../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"
@@ -8479,9 +8657,9 @@
 msgstr[1] "{0} Punkte"
 
-#: ../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-Markierung"
 
-#: ../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"
@@ -8489,5 +8667,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../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"
@@ -8496,9 +8674,9 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../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 "Ton synchronisieren"
 
-#: ../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 ""
@@ -8506,5 +8684,5 @@
 "Synchronisationston hören."
 
-#: ../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
@@ -8512,14 +8690,14 @@
 msgstr "Ton synchronisiert bei Punkt {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 "Sychronisation in Abspielebene nicht möglich."
 
-#: ../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 "Audio-Marke an der aktuellen Abspielposition einfügen"
 
-#: ../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 "
@@ -8529,5 +8707,5 @@
 "die Marke eingefügt werden soll."
 
-#: ../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 ""
@@ -8535,9 +8713,9 @@
 "Offset abgeleitet werden könnte."
 
-#: ../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 "Texte/Symbole anzeigen/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 "Sichtbarkeit von Textmarken und Symbolen umschalten."
@@ -8605,5 +8783,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 "Bitte wählen Sie eine Zeile zum Bearbeiten."
@@ -8617,5 +8795,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."
@@ -9322,5 +9500,5 @@
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Verfügbare Stile (von {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9355,60 +9533,56 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Füge einen Dateinamen oder eine URL für einen aktiven Stil hinzu"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
+msgstr "Entfernt die ausgewählten Stile von der Liste der aktiven Stile"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
+msgstr "Dateiname oder URL für den ausgewählten Stil ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
+msgstr "Ausgewählte verfügbare Stile zu der Liste der aktiven Stile hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Liste der verfügbaren Stile von ''{0}'' laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Neues Tag hinzufügen"
+msgstr "Neuen Pfad für Symbole hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Ausgewählten offenen Änderungssatz schließen"
+msgstr "Ausgewählte Pfade für Symbole entfernen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Ausgewählte Quelle bearbeiten."
+msgstr "Ausgewählten Pfad für Symbole ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Versionsprotokoll für Knoten {0} laden"
+msgstr "Verfügbare Stile von ''{0}'' laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Datenübertragungsfehler zum Server<br>\"{0}\"<br>beim Hoch- oder "
-"Herunterladen.<br>Details: {1}</html>"
+"<html>Laden der verfügbaren Stile von ''{0}'' ist fehlgeschlagen."
+"<br><br>Details: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "Ungültiger Wert ''{1}'' für das Attribut ''{0}''."
+msgstr ""
+"Warnung: Unzulässiges Format für einen Eintrag in der Stil-Liste ''{0}''. "
+"Der Eintrag ist ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -10037,5 +10211,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}''."
@@ -10064,5 +10238,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}."
@@ -10070,5 +10244,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}"
@@ -10081,5 +10255,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}''."
@@ -10245,5 +10419,5 @@
 msgstr "Die Datei \"{0}\" existiert nicht"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10254,19 +10428,19 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 "Das XML-Element <nd> ist kein unmittelbares Kindelement von <way>."
 
-#: ../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 "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> des Wegs {1}"
 
-#: ../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 "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element <nd>."
 
-#: ../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 ""
@@ -10274,20 +10448,20 @@
 "gefunden"
 
-#: ../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 "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
 
-#: ../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 "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}."
 
-#: ../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 "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
@@ -10296,9 +10470,9 @@
 "{1}."
 
-#: ../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 "Unvollständige <member>-Beschreibung mit 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."
@@ -10307,10 +10481,10 @@
 "Dieses wird ignoriert."
 
-#: ../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 "Illegales Objekt mit 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 ""
@@ -10323,9 +10497,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 ""
@@ -10338,25 +10512,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 "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
 
-#: ../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 "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
 
-#: ../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 "Fehlendes erforderliches Attribut \"{0}\"."
 
-#: ../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 "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
 #, java-format
 msgid "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -10365,5 +10539,5 @@
 "mit externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10374,5 +10548,5 @@
 "einer seiner {1} Knoten in den geladenen Daten fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
@@ -10381,5 +10555,5 @@
 "externer ID ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10390,13 +10564,13 @@
 "externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "OSM-Daten einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Datensatz wird vorbereitet ..."
@@ -10552,13 +10726,13 @@
 
 #: ../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 erfolgreich heruntergeladen. JOSM bitte neustarten."
-msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten."
+msgstr[0] "{0} Plugin erfolgreich geladen."
+msgstr[1] "{0} Plugins erfolgreich geladen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Bitte JOSM neu starten."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -10621,7 +10795,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 aktualisieren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10767,35 +10940,4 @@
 "{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 "unbekannt"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -10938,9 +11080,9 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
-msgstr "<html>Der Server hat einen Konflikt identifiziert.</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
@@ -11493,47 +11635,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-Positionen aus EXIF-Daten extrahieren"
 
-#: ../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 "Verzeichnisuntersuchen 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 "Eine der ausgewählten Datei war leer!"
-
-#: ../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 "Photos lesen..."
 
-#: ../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 "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\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 "Verzeichnis {0} untersuchen"
 
-#: ../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 "Leere Datei im Verzeichnis {0} gefunden\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 "Fehler beim Lesen der Dateien im Verzeichnis {0}\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 "Mit GPX korrelieren"
 
-#: ../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."
@@ -11549,24 +11690,24 @@
 msgstr "Einen Satz Bilder als neue Ebene laden."
 
-#: ../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-Dateien (*.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 "Datei {0} ist unter dem Namen \"{1}\" bereits geladen"
 
-#: ../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 "Fehler beim Einlesen von {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 "Kann \"{0}\" nicht lesen"
 
-#: ../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."
@@ -11578,34 +11719,34 @@
 "dem Foto und wählen eine Zeitzone<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 "Fotozeit (aus 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-Zeit (aus obigem Photo): "
 
-#: ../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 "Ich bin in der Zeitzone von: "
 
-#: ../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 "Kein 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 "Ein anderes Foto öffnen"
 
-#: ../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 "Zeit von Foto und GPS-Empfänger synchronisieren"
 
-#: ../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"
@@ -11615,29 +11756,29 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../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 "Ungültiges 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 "<Bisher keine GPS-Daten 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 "GPS-Spur: "
 
-#: ../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 "Eine andere GPS-Spur laden"
 
-#: ../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 "Zeitzone: "
 
-#: ../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 "Offset:"
 
-#: ../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 ""
@@ -11645,41 +11786,41 @@
 "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 "Position aktualisieren für: "
 
-#: ../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 Bilder"
 
-#: ../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 "Bilder ohne EXIF-Position"
 
-#: ../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 "Noch nicht referenzierte Bilder"
 
-#: ../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 "Bilder mit GPS-Spur korrelieren"
 
-#: ../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 "Korrelieren"
 
-#: ../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 ermitteln"
 
-#: ../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 "Wählen Sie eine GPS-Spur"
 
-#: ../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 "Keine GPS-Spur gewählt"
 
-#: ../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 ""
@@ -11690,9 +11831,9 @@
 "Erwartetes Format: {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 "Ungültige Zeitzone"
 
-#: ../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 ""
@@ -11703,26 +11844,26 @@
 "Erwartetes Format: {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 "Ungültiger Offset"
 
-#: ../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} Treffer für {1} in GPS-Spur {2} gefunden"
 
-#: ../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 "GPS-Spur 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 "Die gewählten Bilder enthalten keine Zeitinformation."
 
-#: ../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 "Bilder enthalten keine Zeitinformation"
 
-#: ../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."
 msgstr ""
@@ -11730,39 +11871,39 @@
 "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 "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../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 "Zeitzone: {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 "Sekunden: {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} von {1} Bildern mit GPS-Spur synchronisiert."
 
-#: ../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 "(Zeitdifferenz von {0} Tagen)"
 
-#: ../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 "Offset zwischen GPS-Spur und Bildern: {0}m {1}s"
 
-#: ../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 "
@@ -11773,13 +11914,13 @@
 "synchonisieren."
 
-#: ../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 "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../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 "Zeitzone und Offset anpassen"
 
-#: ../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 "Standardwerte"
@@ -11800,5 +11941,5 @@
 msgstr "Fehler bei Datei {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11814,37 +11955,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 "Feuille auswählen"
 
-#: ../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 "Fehler beim Laden der Datei"
 
-#: ../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 "Lambert-Zone 1 Zwischenspeicherdatei (.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 "Lambert-Zone 2 Zwischenspeicherdatei (.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 "Lambert-Zone 3 Zwischenspeicherdatei (.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 "Lambert-Zone 4 Zwischenspeicherdatei (.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: Ungültige URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11858,18 +11999,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 "Wähle eine Kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Wähle aus..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
@@ -11901,34 +12042,34 @@
 "Fehlermeldung ist: {0}"
 
-#: ../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 "Originale Hintergrundfarbe durch JOSM-Farbe ersetzen."
 
-#: ../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 "Graue Farben invertieren (für schwarze Hintergründe)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Transparenten Hintergrund aktivieren"
 
-#: ../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 "Begrenzung der heruntergeladenen Daten zeichnen."
 
-#: ../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 "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "Enable automatic caching."
 msgstr "Automatischen Zwischenspeicher aktivieren."
 
-#: ../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. Speichergröße (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."
@@ -11946,18 +12087,18 @@
 "dieses Plugins erstellt wurden, hochladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "Französisches Kataster-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 "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Quelle"
 
-#: ../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 "
@@ -11967,5 +12108,5 @@
 "Hintergrundfarbe ersetzen."
 
-#: ../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). "
@@ -11975,9 +12116,9 @@
 "Nützlich für Texte auf dunklen Hintergründen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Stapeln mehrerer Schichten erlauben"
 
-#: ../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 ""
@@ -11985,66 +12126,66 @@
 "durchsichtig."
 
-#: ../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 "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen"
 
 #. 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 "Multiplikator für Vektordaten:"
 
-#: ../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 "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)"
 
-#: ../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 "Feste Quadratgröße (Standard ist 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 "Feste Größe (von 25 bis 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 "Multiplikator für Pixelgrafiken:"
 
 #. 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
+msgstr "Anzeige der Querstücke:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Automatisches \"source\"-Merkmal:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Merkmal  \"source=...\" zu Elementen hinzufügen?"
 
-#: ../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} herunterladen"
 
-#: ../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 "Verbinde zu WMS-Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Gebäude erstellen"
 
-#: ../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"
@@ -12054,6 +12195,6 @@
 "Importgröße für Gebäude auf 1 Quadratkilometer begrenzt."
 
-#: ../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 ""
@@ -12061,25 +12202,25 @@
 "Millisime (Jahr)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "SVG-Dimensionen extrahieren..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Optimale Dimensionen extrahieren..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Grenze erstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Kataster-WMS wird kontaktiert..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr "Bild wurde schon geladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -12089,29 +12230,29 @@
 "Benutze das normale Cadastre-Menü."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "Gemeindegrenze extrahieren"
 
-#: ../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 "Nur für vektorisierte Ebenen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Gebäudeumriss extrahieren"
 
-#: ../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 "Bild vom französischen Kataster-WMS herunterladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Kataster: {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"
@@ -12123,13 +12264,13 @@
 "unterstützte Projektion geändert werden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:48
 msgid "Grab non-georeferenced image"
 msgstr "Nehme ein nicht georeferenziertes Bild."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:69
 msgid "Georeferencing interrupted"
 msgstr "Georeferenzierung wude unterbrochen"
 
-#: ../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"
@@ -12139,5 +12280,5 @@
 "Wollen Sie sie benutzen?"
 
-#: ../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"
@@ -12147,14 +12288,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
 msgid "Image cropping"
 msgstr "Bild beschneiden"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Click second corner for image cropping"
 msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden."
 
-#: ../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"
@@ -12164,14 +12305,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
 msgid "Image georeferencing"
 msgstr "Bild georeferenzieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
 
-#: ../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"
@@ -12181,64 +12322,64 @@
 "oder es erneut versuchen "
 
-#: ../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 "Bitte die Cadastre Ost,Nord-Position eingeben"
 
-#: ../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 "(Achtung: Pfeil muss nach Norden zeigen!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "East"
 msgstr "Ost"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Nord"
 
-#: ../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 "Setze {0} Lambert-Koordinaten"
 
-#: ../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 "Setzen Sie die Lambert-Zone manuell"
 
-#: ../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 "Position aus dem Zwischenspeicher laden (nur wenn er aktiviert ist)"
 
-#: ../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 "{0} ist in der aktuellen Projektion nicht erlaubt"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Ort ändern"
 
-#: ../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 "Für die nächste Anfrage eine neue Position setzen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Neue Ebene hinzufügen"
 
-#: ../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 "Ort"
 
-#: ../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 "
@@ -12248,25 +12389,25 @@
 "bekannte Syntax.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr "Eine neue Ebene hinzufügen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Cookie zurücksetzen"
 
-#: ../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 "Einen neuen Cookie holen (Sitzung abgelaufen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "PNG-Bilder (*.png)"
 
-#: ../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 "Im PNG-Format exportieren (nur Pixelgrafiken)"
 
-#: ../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
@@ -12276,20 +12417,22 @@
 msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)"
 
-#: ../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 justieren"
 
-#: ../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 "Position des WMS-Layers justieren (nur Rasterbilder)"
 
-#: ../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"
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
+"Dieser Modus funktioniert nur wenn die aktuelle Ebene\n"
+"ein Katasterplan (Rasterdarstellung) ist."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:20
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
 #, java-format
@@ -12297,5 +12440,5 @@
 msgstr "Lade WMS-Ebene aus Datei {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"
@@ -12305,34 +12448,34 @@
 "Bitte eine auswählen und erneut versuchen."
 
-#: ../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 "Leere Ebene"
 
-#: ../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-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../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 "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../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 "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12344,9 +12487,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../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}"
@@ -12355,9 +12498,9 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12367,4 +12510,8 @@
 "manually the Lambert zone from the Cadastre menu"
 msgstr ""
+"Aktuelle Ebene ist in der Lambert CC9 Zone \"{0}\"\n"
+"während sich die Kommune in der Lambert CC9 Zone \"{1}\" befindet.\n"
+"Lade deine Änderungen hinauf, schließe alle Ebenen und ändere\n"
+"manuell die Lambert Zone im Katastermenü"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -12467,9 +12614,9 @@
 msgstr "Weg duplizieren"
 
-#: ../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 "Ebene zum Änderung von GPS-Spuren"
 
-#: ../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 "In GPX-Ebene mit anonymer Zeit konvertieren"
@@ -12486,11 +12633,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 "Weg aus GPX-Ebene importieren"
 
 #: ../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 "Existierenden Weg verwerfen"
@@ -12500,5 +12647,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 "Keine GPX-Datenebene gefunden."
@@ -12711,5 +12858,5 @@
 msgstr "Nicht georeferenzierte Bilder anzeigen"
 
-#: ../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 "Importierte Bilder"
@@ -13143,5 +13290,5 @@
 msgstr "Winkel zwischen zwei gewählten Knoten"
 
-#: ../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 "Ebene für Messungen"
@@ -13175,5 +13322,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
 msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Bitte wählen Sie 4 Wege aus, die eine geschlossene Relation bilden."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
@@ -13205,12 +13352,14 @@
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
+"Einer der ausgewählten Wege ist bereits in einem anderen Multipolygon "
+"enthalten."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
+msgstr "Ein Multipolygon darf nur aus geschlossenen Wegen bestehen."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Sie müssen mindestens zwei Wege auswählen."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13222,5 +13371,5 @@
 msgstr "OpenStreetBugs Lade-Warteschleife"
 
-#: ../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-Einträge anzeigen"
@@ -13369,7 +13518,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Ebene"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13538,43 +13686,41 @@
 msgstr "Gewichtswerte eingeben"
 
-#: ../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 "Karte"
 
-#: ../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 "Automatisches Zoomen: "
-
-#: ../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 "Lade Kachel"
 
-#: ../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 "Informationen anzeigen"
-
-#: ../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 Kacheln 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 erhöhen"
 
-#: ../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 reduzieren"
 
-#: ../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 "Kachel-Zwischenspeicher leeren"
 
-#: ../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 "Bild "
@@ -13610,7 +13756,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max. Zoomstufe: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13965,6 +14110,6 @@
 msgstr "Sind Sie sicher?"
 
-#: ../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
@@ -13972,5 +14117,5 @@
 msgstr "Ergebnisse der Datenprüfung"
 
-#: ../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 "Keine Fehler gefunden"
@@ -14059,5 +14204,5 @@
 msgstr "Datenprüfung: 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}"
@@ -14157,7 +14302,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Ungeordnete Küsten"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -14167,5 +14311,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr ""
+msgstr "Die Richtung einer Küstenlinie ist falsch"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -14190,18 +14334,18 @@
 msgstr "Überschneidende Wege"
 
-#: ../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 "Doppelte Knoten"
 
-#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
 
-#: ../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 "Knoten auf derselben Position"
 
-#: ../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 "Bestätigung"
@@ -14238,5 +14382,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
 msgid "Missing name:* translation."
-msgstr ""
+msgstr "Fehlende Bezeichnungs:* Übersetzung."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -14246,12 +14390,15 @@
 "Italia - Italien - Italy."
 msgstr ""
+"Dieser Test findet mehrsprachige Objekte, deren Attribut 'name' weder mit "
+"einem 'name:*' Attribut, noch mit einer Komposition von 'name:*' Attributen "
+"übereinstimmt. Beispiel: Italia - Italien - Italy."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
 msgid "A name:* translation is missing."
-msgstr ""
+msgstr "Eine Bezeichnung:* Übersetzung fehlt."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:73
 msgid "A name is missing, even though name:* exists."
-msgstr ""
+msgstr "Eine Bezeichung fehlt, obwohl schon die Bezeichung:* vorhanden ist."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
@@ -14361,80 +14508,80 @@
 #. 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 "Zeichenproblem"
 
-#: ../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 "Schlüssel \"{0}\" ungültig."
 
-#: ../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 "Merkmale mit leerem Wert"
 
-#: ../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 "Ungültiger Schlüssel"
 
-#: ../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 "Ungültiger Leerraum in Schlüssel"
 
-#: ../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 "Werte beginnen oder enden mit Leerraum"
 
-#: ../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 "Werte enthalten HTML-Entität"
 
-#: ../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 "Schlüssel \"{0}\" nicht in Vorlagen."
 
-#: ../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 "Vorlagen enthalten Schlüssel nicht"
 
-#: ../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 "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen."
 
-#: ../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 "Vorlagen enthalten Wert nicht"
 
-#: ../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 "Korrekturnotizen"
 
-#: ../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 "Schlüssel prüfen."
 
-#: ../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 "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen."
 
-#: ../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 "Komplexen Eigenschaftsprüfer verwenden."
 
-#: ../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 "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen."
 
-#: ../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 "Datenquelle für Merkmalsprüfer"
 
-#: ../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."
@@ -14444,33 +14591,33 @@
 "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung."
 
-#: ../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 "Eine neue Quelle zur Liste hinzufügen."
 
-#: ../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 "Ausgewählte Quelle bearbeiten."
 
-#: ../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 "Ausgewählte Quelle aus der Liste entfernen."
 
-#: ../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 "Datenquellen"
 
-#: ../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 "Werte überprüfen."
 
-#: ../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 "Prüft die Gültigkeit von Werten anhand von Objektvorlagen."
 
-#: ../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 "Auf Korrekturnotizen prüfen."
 
-#: ../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 ""
@@ -14478,54 +14625,54 @@
 "(fixme) stehen haben."
 
-#: ../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 "Zeichennotizen prüfen."
 
-#: ../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 "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
 
-#: ../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 "Standarddatendatei verwenden."
 
-#: ../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 "Nutzung der Standarddatendatei (empfohlen)."
 
-#: ../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 "Standarddatei zum Merkmale ignorieren verwenden."
 
-#: ../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 "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)."
 
-#: ../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 "Standarddatei für Schreibprüfung verwenden."
 
-#: ../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 "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)."
 
-#: ../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 "Eigenschaften korrigieren"
 
-#: ../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 "Konnte Elementtyp nicht finden"
 
-#: ../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 "Konnte Warnlevel nicht finden"
 
-#: ../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 "Ungültiger Ausdruck \"{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}''"
@@ -14702,17 +14849,17 @@
 "hat."
 
-#: ../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 "Wegende nahe anderer Straße"
 
-#: ../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 "Wegende nahe anderem 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 "Wegpunkt nahe anderem 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 "Verbundenes Wegende nahe anderem Weg"
@@ -14767,13 +14914,13 @@
 msgstr "Dieser Test überprüft die Richtung von Wasser, Land und Küsten."
 
-#: ../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 "Verdrehte Küstenlinie: Land nicht auf der linken Seite"
 
-#: ../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 "Verdrehtes Wasser: Land nicht auf der linken Seite"
 
-#: ../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 "Verdrehtes Land: Land nicht auf der linken Seite"
@@ -14813,93 +14960,76 @@
 
 #: ../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-Ebene ({0}): Laden mit Zoom {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-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 "Startknoten an einem Wegende auswählen"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Ende des Pfades erreicht"
-
-#. 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"
-msgstr "Kreuzung erreicht"
+msgstr "Laufkarten (Arbeitskarten zum Drucken, Bearbeiten, Scannen)"
+
+#: ../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 "Daten herunterladen"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Kartendaten vom OSM-Server laden."
+
+#: ../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>Es gibt keine Ebene mit der die Ausgangsebene<br>''{0}''<br>vereint "
+"werden könnte.</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 "Doppelte Knoten entfernen..."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#, fuzzy
+msgid "<html>No more connected ways to download.</html>"
+msgstr "<html>Es ist kein Ladebereich ausgewählt.</html>"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Fehler"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "Hilfe"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Hilfe / Über"
-
-#: ../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 ""
-"Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
-"und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
-"\n"
-"Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
-"Schema erledigen:\n"
-"wmsplugin.url.1.name=LandSat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE-Karten ...\n"
-"\n"
-"Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
-"\n"
-"Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-"muss nur die relevante ID eingegeben werden.\n"
-"Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
-"manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-"Bild-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"
-"Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
-"sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Hilfe für WMS-Plugin"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -15007,9 +15137,9 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
 
-#: ../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}''"
@@ -15018,19 +15148,19 @@
 "ungültiges Format hat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../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-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../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-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -15045,13 +15175,13 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../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"
 msgstr ""
@@ -15059,42 +15189,42 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../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 "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
@@ -15345,4 +15475,6 @@
 "relation editor."
 msgstr ""
+"Erstelle ein Multipolygon mit einem Mausklick, wesentlich einfacher als mit "
+"dem Standard-Relationen-Editor."
 
 #. Plugin nearclick
@@ -19563,14 +19695,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Ausgrabungsstelle"
+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 "Ausgrabungsstelle bearbeiten"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -21849,5 +21979,5 @@
 #: build/trans_presets.java:2476
 msgid "gray"
-msgstr ""
+msgstr "grau"
 
 #: build/trans_presets.java:2476
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 18508)
+++ applications/editors/josm/i18n/po/el.po	(revision 18656)
@@ -8,7 +8,7 @@
 "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-30 11:21+0000\n"
-"Last-Translator: logictheo <towardsoss@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-17 11:00+0000\n"
+"Last-Translator: alichani <alichani@yahoo.co.uk>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\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:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:04+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 "Σφάλμα"
@@ -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"
@@ -298,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Συνέχεια"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -455,5 +456,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
@@ -495,5 +496,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
@@ -502,6 +503,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"
@@ -574,10 +576,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
-msgstr ""
+msgstr "Κλείσιμο ανοιχτών ομάδων αλλαγών"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Κλείνει τις ανοιχτές ομάδες αλλαγών"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
@@ -597,15 +599,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Δε υπάρχουν ανοιχτές ομάδες αλλαγών"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Καμία ανοιχτή ομάδα αλλαγών"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Λήψη ανοιχτών ομάδων αλλαγών..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
@@ -672,5 +674,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "Οι κόμβοι  δεν είναι σε κύκλο. Ακύρωση."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
@@ -683,5 +685,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
@@ -694,5 +696,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"
@@ -765,5 +767,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
@@ -771,31 +781,31 @@
 msgstr ""
 
-#: ../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 "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
 
-#: ../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
+msgstr "Διενέξεις κατά την λήψη"
+
+#: ../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
+msgstr "({0}/{1}) Φόρτωση γονέων κόμβου {2}"
+
+#: ../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}"
-msgstr ""
+msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -825,14 +835,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
-msgstr ""
+msgstr "Όλοι οι τύποι"
 
 #: ../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 "Εξαγωγή σε 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 "Εξαγωγή των δεδομένων σε αρχείο GPX."
@@ -845,11 +855,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
@@ -880,5 +889,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
@@ -893,17 +901,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
@@ -934,10 +943,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
-msgstr ""
+msgstr "Εξαγωγή αρχείου GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr ""
+msgstr "Ιστορικό Αντικειμένου"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
@@ -963,5 +972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Ένωση Κόμβου και Γραμμής"
@@ -973,9 +982,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
-msgstr ""
+msgstr "Συγχώνευση επιπέδου"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
-msgstr ""
+msgstr "Συγχώνευση τρέχοντως επιπέδου σε άλλο επίπεδο"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
@@ -992,14 +1001,13 @@
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Διακοπή..."
-
-#: ../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
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #, java-format
 msgid ""
@@ -1007,5 +1015,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1015,5 +1023,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
-msgstr ""
+msgstr "Συγχώνευση επιλογής"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
@@ -1097,10 +1105,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
-msgstr ""
+msgstr "Άνοιγμα αρχείων"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
-msgstr ""
+msgstr "Άνοιγμα αρχείου ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
@@ -1119,5 +1127,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
+msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
@@ -1127,5 +1135,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
+msgstr "Εισάγετε ένα URL από όπου θα πρέπει να ληφθούν τα δεδομένα"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
@@ -1139,14 +1147,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
+msgstr "Έναρξη λήψης δεδομένων"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Λήψη δεδομένων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1194,5 +1201,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
+msgstr "Χρήση"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
@@ -1271,5 +1278,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Αδυναμία μετονομασίας αρχείου ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1293,10 +1300,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 "Αποθήκευση"
 
 #: ../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 "Αποθήκευση τεχόντων δεδομένων."
@@ -1351,10 +1358,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 "Αποθήκευση ως..."
 
 #: ../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 "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο."
@@ -1396,25 +1403,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 "Κλείσιμο"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση."
 
-#: ../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."
@@ -1422,5 +1429,5 @@
 msgstr[1] ""
 
-#: ../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 "
@@ -1436,9 +1443,9 @@
 "επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο."
 
-#: ../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 ""
 
-#: ../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."
@@ -1446,10 +1453,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -1457,5 +1464,5 @@
 msgstr ""
 
-#: ../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 "
@@ -1463,5 +1470,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 "
@@ -1469,5 +1476,5 @@
 msgstr ""
 
-#: ../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"
@@ -1497,42 +1504,42 @@
 msgstr ""
 
-#: ../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 "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../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 "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../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 ""
 
-#: ../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 "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Επιλέξτε οποιοδήποτε:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Ένας κόμβος με ετικέτα, ή"
 
-#: ../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 "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή"
 
-#: ../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 ""
 
-#: ../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"
 msgstr ""
 
-#: ../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."
@@ -1541,5 +1548,5 @@
 "χρησιμοποιούνται από περισσότερο από έναν δρόμο."
 
-#: ../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"
@@ -1549,9 +1556,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Ξεκολημένος Κόμβος"
 
-#: ../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"
@@ -1559,5 +1566,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"
@@ -1598,12 +1605,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
+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 ""
@@ -1619,6 +1625,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Ενημέρωση επιλογών"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1632,6 +1639,7 @@
 
 #: ../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 "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
@@ -1639,8 +1647,13 @@
 msgstr "Κενή επιλογή"
 
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Ενημέρωση επιλογών"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
-msgstr ""
+msgstr "Αποστολή δεδομένων"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1763,5 +1776,5 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Αποστολή δεδομένων επιπέδου ''{0}''"
 
 #. we tried to delete an already deleted primitive.
@@ -1780,7 +1793,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Αλλαγή {0} αντικειμένου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1791,9 +1804,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
-msgstr ""
+msgstr "Αποστολή επιλογής"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
+msgstr "Αποστολή όλων των αλλαγών της τρέχουσας επιλογής στον διακομιστή OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
@@ -1902,9 +1915,9 @@
 msgstr "Λήψη Δεδομένων GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Λήψη δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1912,5 +1925,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 ""
@@ -1926,7 +1939,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "ορατό (στον διακομιστή)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1960,7 +1972,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -1970,7 +1982,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Σφάλματα κατά την λήψη"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1984,5 +1995,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
@@ -2013,6 +2024,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 "επιλεγμένο"
@@ -2030,26 +2041,26 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Δημιοθργία νέου κόμβου."
 
-#: ../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 "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../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."
@@ -2058,50 +2069,47 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Τέλος σχεδιασμού."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Δημιουργία περιοχών"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 ""
-"Αφήστε το πλήκτρο του ποντικιού για να επιλέξετε τα αντικείμενα μέσα στο "
-"τετράγωνο"
-
-#: ../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 ""
 "Σχεδιάστε ένα παραλληλόγραμο του επιθυμητού μεγέθους, και αφήστε το πλήκτρο "
 "του ποντικιού."
 
-#: ../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 "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
-
-#: ../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 ""
+"Σχεδιάστε ένα παραλληλόγραμο του επιθυμητού μεγέθους, και αφήστε το πλήκτρο "
+"του ποντικιού."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr ""
 
@@ -2156,4 +2164,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+"Αφήστε το πλήκτρο του ποντικιού για να επιλέξετε τα αντικείμενα μέσα στο "
+"τετράγωνο"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2162,4 +2176,8 @@
 "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε να κινήστε. Ctrl για "
 "συγχώνευση με το πλησιέστερο κόμβο."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2187,69 +2205,71 @@
 "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
 
-#: ../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 "Αναζήτηση..."
 
-#: ../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 "Αναζήτηση αντικειμένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Παρακαλώ εισάγετε κείμενο αναζήτησης."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+msgid "Enter the search expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "αντικατάσταση επιλογής"
 
-#: ../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 "προσθήκη στην επιλογή"
 
-#: ../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 "αφαίρεση από την επιλογή"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr ""
 
-#: ../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>Baker Street</b> - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../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:Bak</b> - 'Bak' οπουδήποτε στο όνομα."
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2257,34 +2277,34 @@
 msgstr ""
 
-#: ../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:Bak</b> - χωρίς 'Bak' στο όνομα."
 
-#: ../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> - κλειδί=foot ορισμένο με οποιαδήποτε τιμή."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>user:</b>... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2292,43 +2312,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - όλα τα αλλαγμένα αντικείμενα"
 
-#: ../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> - όλα τα επιλεγμένα αντικείμενα"
 
-#: ../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> - όλα τα ημιτελή αντικείμενα"
 
-#: ../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>untagged</b> - όλα τα αντικείμενα χωρίς ετικέτες"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2338,51 +2358,51 @@
 msgstr "Φίλτρο"
 
-#: ../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 "Αναζήτηση"
 
-#: ../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 "Έναρξη αναζήτησης"
 
-#: ../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 "Δεν βρέθηκε αποτέλεσμα για ''{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 "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\""
 
-#: ../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 "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\""
 
-#: ../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} αποτελέσματα"
 
-#: ../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"
@@ -2550,6 +2570,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
@@ -2674,5 +2694,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 ""
@@ -2698,4 +2718,7 @@
 
 #: ../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"
@@ -2731,5 +2754,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 ""
@@ -2737,6 +2760,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."
@@ -2748,5 +2771,5 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2757,5 +2780,15 @@
 msgstr ""
 
-#: ../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"
@@ -2837,5 +2870,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"
@@ -2940,8 +2973,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
 msgid "Illegal double value ''{0}''"
-msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3121,5 +3160,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
@@ -3133,5 +3172,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 ""
@@ -3139,4 +3178,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3194,32 +3269,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Σφάλμα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Προειδοποίηση: {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 ""
 
@@ -3244,45 +3320,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected, got {1}"
+msgstr ""
+
+#: ../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
@@ -3293,6 +3352,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 ""
 
@@ -3303,145 +3363,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 ""
 
-#: ../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 ""
 
-#: ../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 "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Άγνωστος ρόλος \"{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 "Άγνωστος τύπος μέλους για το \"{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 "Οδός \"από\" δεν βρέθηκε."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Χωρίς ετικέτα"
 
-#: ../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 "κείμενο"
 
-#: ../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 "Σφάλμα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Προειδοποίηση: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "ανενεργό"
 
-#: ../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
@@ -3451,5 +3511,5 @@
 msgstr[1] "κόμβοι"
 
-#: ../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
@@ -3459,6 +3519,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -3468,13 +3528,13 @@
 msgstr[1] "σχέσεις"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -3482,5 +3542,5 @@
 msgstr "φόντο"
 
-#: ../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 ""
@@ -3564,5 +3624,5 @@
 msgstr "Να μην εμφανιστεί ξανά"
 
-#: ../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
@@ -3570,32 +3630,32 @@
 msgstr ""
 
-#: ../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 "μη ολοκληρωμένη"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
 
-#: ../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 "σιδηρόδρομος"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "υδατόρρευμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "χρήση γής"
 
-#: ../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"
@@ -3604,5 +3664,5 @@
 msgstr[1] "{0} κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3611,33 +3671,33 @@
 msgstr[1] "{0} μέλη"
 
-#: ../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
@@ -3645,9 +3705,9 @@
 msgstr "Διένεξη"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Άγνωστος υπολογιστής"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3669,7 +3729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Κλείσιμο του διαλόγου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3865,5 +3924,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 "Επεξεργασία"
@@ -3989,10 +4048,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 "το επίπεδο δεν είναι στη λίστα."
 
-#: ../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"
@@ -4000,7 +4059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Όχι, ακύρωση της λειτουργίας"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4100,5 +4158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Δική μου με συγχωνευμένη"
 
 #. *
@@ -4107,5 +4165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
+msgstr "Δική τους με συγχωνευμένη"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
@@ -4122,5 +4180,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"
@@ -4129,5 +4187,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"
@@ -4137,5 +4195,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 "Μέλη"
@@ -4567,5 +4625,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 "Όχι, ακύρωση"
@@ -4623,6 +4681,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 "<ακαθόριστο>"
@@ -4751,4 +4807,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"
@@ -4845,5 +4902,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"
@@ -4854,5 +4911,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"
@@ -4893,7 +4950,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4979,5 +5035,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
@@ -5073,5 +5129,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"
@@ -5127,11 +5183,11 @@
 msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων."
 
-#: ../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
@@ -5139,13 +5195,13 @@
 msgstr "Επαναφόρτωση"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -5202,7 +5258,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] "Αυτό θα αλλάξει εώς {0} αντικείμενο."
@@ -5210,5 +5265,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 "Κενή τιμή διαγράφει το κλειδί."
 
@@ -5233,4 +5289,11 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
+#: ../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] "Αυτό θα αλλάξει εώς {0} αντικείμενο."
+msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5308,60 +5371,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 "Σχέσεις"
 
-#: ../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 "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../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 "Σχέσεις: {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 "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../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 "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../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 "Σημιουργία νέας σχέσης"
 
-#: ../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 "Διαγραφή της επιλεγμένης σχέσης"
-
-#: ../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 "Επιλέξτε οποιοδήποτε:"
-
-#: ../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 "Διαγραφή της επιλεγμένης σχέσης"
-
-#: ../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 "Λήψη μελών"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5519,5 +5578,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}"
@@ -5756,18 +5815,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 ""
@@ -5790,5 +5849,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}"
@@ -5870,12 +5929,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Δημιουργία ορίου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5886,7 +5943,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 "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5896,12 +5952,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5992,7 +6046,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Δεν επιλέχθηκε ίχνος GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6012,12 +6065,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6046,12 +6097,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Αναζήτηση..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Κατεύθυνση για αναζήτηση ξηράς"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -6981,7 +7030,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "κοντά"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7026,5 +7074,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 ""
@@ -7038,5 +7086,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 ""
@@ -7047,5 +7095,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 ""
@@ -7054,19 +7102,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 ""
@@ -7076,32 +7124,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 ""
@@ -7123,37 +7171,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 ""
@@ -7161,5 +7209,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 ""
@@ -7167,9 +7215,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 ""
@@ -7178,24 +7226,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr ""
+
+#: ../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}"
@@ -7208,4 +7266,22 @@
 msgstr "Κόμβος {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Ζούμ στο πρόβλημα"
+
+#: ../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 "Φόρτωση ιστορικού"
+
+#: ../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
@@ -7218,17 +7294,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 "Ταξινόμηση μενού προεπιλογών"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Χρήστης"
 
-#: ../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 "άγνωστο"
+
+#: ../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 "Anonymous"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7253,4 +7379,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "διαγράφηκε"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
 
@@ -7327,9 +7468,10 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"Το επίπεδο \"{0}\" έχει αλλαγές που πρέπει να αποσταλλούν στον διακομιστή."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Το επίπεδο ''{0}'' δεν έχει αλλαγές προς αποστολή."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -7380,9 +7522,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Μη αποθηκευμένες αλλαγές - Αποθήκευση/Αποστολή πριν την διαγραφή;"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Αποστολή και αποθήκευση αλλαγμένων επιπέδων ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
@@ -7456,13 +7598,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save/Upload and Exit"
-msgstr ""
+msgstr "Αποθήκευση/Αποστολή και Έξοδος"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
+"Έξοδος από το JOSM με αποθήκευση. Οι μη αποθηευμένες αλλαγές θα αποσταλλούν "
+"και/ή θα αποθηκευθούν."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save/Upload and Delete"
-msgstr ""
+msgstr "Αποθήκευση/Αποστολή και Διαγραφή"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -7473,5 +7617,5 @@
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
+msgstr "Προετοιμασία επιπέδου \"{0}\" για αποστολή ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
@@ -7554,5 +7698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
 msgid "Upload"
-msgstr ""
+msgstr "Αποστολή"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
@@ -7595,9 +7739,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] "Αντικείμενα που θα αλλαχτούν"
-msgstr[1] "Αντικείμενα που θα αλλαχτούν"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7677,13 +7821,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
@@ -7750,5 +7894,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}..."
@@ -7760,5 +7904,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 ""
@@ -7784,5 +7928,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"
@@ -7837,43 +7981,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"
 
 #: ../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 "Προσαρμογή του σχεδιασμού γραμμών"
 
 #: ../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 "Χρηση καθολικών ρυθμίσεων."
 
 #: ../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 "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
 #: ../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 "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
 #: ../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 "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
 #: ../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 "Προσαρμογή Χρώματος"
 
 #: ../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"
@@ -7881,6 +8025,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"
@@ -7970,10 +8114,10 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../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 "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../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."
@@ -7983,43 +8127,43 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../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 "Μετατράπηκε από: {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 "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../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 "Λήψη όλων εντός:"
 
-#: ../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} μέτρα"
 
-#: ../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 "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../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} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8030,10 +8174,10 @@
 "συνεχίσετε;</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 ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../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 "
@@ -8041,5 +8185,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8099,33 +8243,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} διαγράφηκαν.)"
-msgstr[1] " ({0} διαγράφηκαν.)"
-
-#: ../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} αποτελείται από:"
 
-#: ../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: {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 "Μετατροπή σε επίπεδο GPX"
 
-#: ../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."
@@ -8133,5 +8277,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"
@@ -8140,5 +8284,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"
@@ -8146,5 +8290,5 @@
 msgstr[1] "σημεία"
 
-#: ../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"
@@ -8153,5 +8297,5 @@
 msgstr[1] "ένα ίχνος με {0} σημεία"
 
-#: ../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"
@@ -8160,5 +8304,5 @@
 msgstr[1] "το {0} αποτελείται από {1} ίχνη"
 
-#: ../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"
@@ -8167,9 +8311,9 @@
 msgstr[1] "{0} σημεία"
 
-#: ../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"
 
-#: ../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"
@@ -8177,5 +8321,5 @@
 msgstr[1] "σημάδια"
 
-#: ../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"
@@ -8184,9 +8328,9 @@
 msgstr[1] "{0} αποτελείται από {1} σημάδια"
 
-#: ../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 "Συγχρονισμός ήχου"
 
-#: ../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."
@@ -8195,5 +8339,5 @@
 "συγχρονισμού."
 
-#: ../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
@@ -8201,14 +8345,14 @@
 msgstr "Ήχος συγχρονισμένος στο σημείο {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 "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
 
-#: ../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 ""
 
-#: ../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 "
@@ -8216,13 +8360,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων"
 
-#: ../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 ""
@@ -8290,5 +8434,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 "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
@@ -8302,5 +8446,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."
@@ -9018,19 +9162,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
 msgstr ""
-"Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
 msgstr ""
-"Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9040,17 +9179,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Προσθήκη νέου επιπέδου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Ανανέωση της λίστας επιλεγμένων."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Επιξεργασία της επιλεγμένης πηγής."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9060,11 +9196,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
@@ -9671,5 +9805,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}''."
@@ -9696,5 +9830,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}."
@@ -9702,5 +9836,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}"
@@ -9713,5 +9847,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}''."
@@ -9864,5 +9998,5 @@
 msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9871,38 +10005,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 ""
@@ -9910,19 +10044,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 ""
 
-#: ../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 "Άγνωστο αντικείμενο με 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 ""
@@ -9933,9 +10067,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 ""
@@ -9945,25 +10079,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 ""
@@ -9971,5 +10105,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9978,5 +10112,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9984,5 +10118,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9991,13 +10125,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..."
 
-#: ../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 ""
@@ -10149,10 +10283,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} πρόσθετο φορτώθηκε με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
+msgstr[0] ""
 msgstr[1] ""
-"{0} πρόσθετα φορτώθηκαν με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10214,7 +10347,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Ενημέρωση πρόσθετων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10360,35 +10492,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 "άγνωστο"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11014,47 +11115,46 @@
 "{0} χμ/ω"
 
-#: ../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 από EXIF"
 
-#: ../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 "Έναρξη σάρωσης καταλόγου"
 
-#: ../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 "Ένα από τα επιλεγμένα αρχεία ήταν μηδενικό !!!"
-
-#: ../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 "Ανάγνωση φωτογραφιών"
 
-#: ../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 ""
 
-#: ../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 "Σάρωση καταλόγου {0}"
 
-#: ../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 "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\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 "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\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 ""
 
-#: ../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."
@@ -11070,24 +11170,24 @@
 msgstr "Φόρτωση ομάδας εικόνων ως νέο επίπεδο."
 
-#: ../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 (*.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 ""
 
-#: ../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 "Σφάλμα κατά την ερμηνεία {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 "Αδυναμία ανάγνωσης \"{0}\""
 
-#: ../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."
@@ -11096,34 +11196,34 @@
 msgstr ""
 
-#: ../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 "Ώρα φωτογραφίας (από 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 (διαβάστε από την παραπάνω φωτογραφία): "
 
-#: ../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 " [ηη/μμ/εεεε ωω:λλ:δδ]"
 
-#: ../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 "Βρίσκομαι στην ζώνη ώρας: "
 
-#: ../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 "Χωρίς ημερομηνία"
 
-#: ../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 "Άνοιγμα άλλης φωτογραφίας"
 
-#: ../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 "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS"
 
-#: ../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"
@@ -11131,29 +11231,29 @@
 msgstr ""
 
-#: ../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 "Μη έγκυρη ημερομηνία"
 
-#: ../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 ""
 
-#: ../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: "
 
-#: ../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 "Άνοιγμα άλλου ίχνους GPX"
 
-#: ../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 "Ζώνη Ώρας: "
 
-#: ../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 "Μετατόπιση:"
 
-#: ../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 ""
@@ -11161,41 +11261,41 @@
 "βοηθήσει;</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 "Ενημέρωση θέσης για: "
 
-#: ../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 "Όλες οι εικόνες"
 
-#: ../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 "Εικόνες χωρίς θέση exif"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Συσχέτιση"
 
-#: ../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 ""
 
-#: ../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 "Πρέπει να επιλέξετε ένα ίχνος GPX"
 
-#: ../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 "Δεν επιλέχθηκε ίχνος GPX"
 
-#: ../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 ""
@@ -11204,9 +11304,9 @@
 msgstr ""
 
-#: ../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 "Λανθασμένη ζώνη ώρας"
 
-#: ../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 ""
@@ -11215,65 +11315,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
 
-#: ../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 "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
 
-#: ../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."
 msgstr ""
 
-#: ../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 δεν περιέχει πληροφορίες ώρας"
 
-#: ../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 "Ζώνη ώρας: {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 "Λεπτά: {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 "Δευτερόλεπτα: {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 ""
 
-#: ../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 "(Διαφορά ώρας {0} ημερών)"
 
-#: ../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 "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ"
 
-#: ../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 "
@@ -11281,13 +11381,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 ""
 
-#: ../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 "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../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 ""
@@ -11308,5 +11408,5 @@
 msgstr "Σφάλμα στο αρχείο {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11319,37 +11419,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 "Σφάλμα φόρτωσης αρχείου"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11361,18 +11461,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Επιλέξτε από..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11399,34 +11499,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 "Αντικατάσταση αρχικού φόντου με το χρώμα φόντου του 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 "Αντιστορή γκρι χρωμάτων (για μαύρο φόντο)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Διαφανές φόντο."
 
-#: ../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 "Σχεδιασμός ορίων δεδομένων που λήφθησαν."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11438,18 +11538,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Πηγή"
 
-#: ../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 "
@@ -11459,5 +11559,5 @@
 "προτιμήσεις του JOSM."
 
-#: ../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). "
@@ -11465,76 +11565,76 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 "Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές."
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 "Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Προσθήκη \"source=...\" στα στοιχεία;"
 
-#: ../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}"
 
-#: ../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 "Επικοινωνία με διακομιστή WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Δημιουργία κτηρίων"
 
-#: ../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"
@@ -11542,30 +11642,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Δημιουργία ορίου"
 
-#: ../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"
@@ -11573,29 +11673,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 ""
 
-#: ../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 "Μόνο σε διανυσματικά επίπεδα"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11604,13 +11704,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"
@@ -11618,5 +11718,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"
@@ -11624,14 +11724,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"
@@ -11639,14 +11739,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"
@@ -11654,64 +11754,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 "Ζώνη"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Ζώνη Lambert"
 
-#: ../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 ""
 
-#: ../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 "Αλλαγή θέσης"
 
-#: ../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 "Ρύθμιση νέας θέσης για την επόμενη αίτηση"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Προσθήκη νέου επιπέδου"
 
-#: ../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 "Θέση"
 
-#: ../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 "
@@ -11719,25 +11819,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr "Προσθήκη νέου επιπέδου"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11747,14 +11847,14 @@
 msgstr[1] ""
 
-#: ../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"
 
-#: ../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"
@@ -11762,5 +11862,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
@@ -11768,5 +11868,5 @@
 msgstr "Λήψη πλακιδίου WMS από {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"
@@ -11776,34 +11876,34 @@
 "Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε"
 
-#: ../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 "Άδειο επίπεδο"
 
-#: ../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 ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Δεν είναι διανυσματικό."
 
-#: ../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 "Είναι διανυσματικό."
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11812,18 +11912,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11930,9 +12030,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11949,11 +12049,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 ""
 
 #: ../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 ""
@@ -11963,5 +12063,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 ""
@@ -12171,5 +12271,5 @@
 msgstr ""
 
-#: ../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 "Εισαγμένες Εικόνες"
@@ -12601,5 +12701,5 @@
 msgstr "Γωνία μεταξύ δύο επιλεγμένων Κόμβων"
 
-#: ../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 "Επίπεδο για την λήψη μετρήσεων"
@@ -12678,5 +12778,5 @@
 msgstr "Βρόχος λήψης 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 ""
@@ -12815,7 +12915,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Επίπεδο"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12979,43 +13078,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 Map"
 
-#: ../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 "Αυτόματο ζουμ: "
-
-#: ../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 "Φόρτωση πλακιδίου"
 
-#: ../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 "Εμφάνιση κατάστασης πλακιδίου"
-
-#: ../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 "Φόρτωση όλων των πλακιδίων"
 
-#: ../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 "Άυξηση ζουμ"
 
-#: ../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 "Μείωση ζουμ"
 
-#: ../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 ""
@@ -13051,7 +13148,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Μέγιστο επίπεδο ζούμ: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13242,5 +13338,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
-msgstr ""
+msgstr "Ένωση αλληλοκαλυπτόμενων Περιοχών"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -13396,6 +13492,6 @@
 msgstr "Είστε σίγουροι;"
 
-#: ../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
@@ -13403,5 +13499,5 @@
 msgstr "Σφάλματα επαλήθευσης"
 
-#: ../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 "Κανένα σφάλμα επαλήθευσης"
@@ -13490,5 +13586,5 @@
 msgstr "άλλο επαλήθευσης"
 
-#: ../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}"
@@ -13588,7 +13684,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "ακτογραμμή"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13618,18 +13713,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13783,80 +13878,80 @@
 #. 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 ""
 
-#: ../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 "Το κλειδί \"{0}\" δεν είναι έγκυρο."
 
-#: ../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 "Ετικέτες χωρίς τιμές"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές"
 
-#: ../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 ""
 
-#: ../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 "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές."
 
-#: ../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 ""
 
-#: ../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 "FIXMES"
 
-#: ../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 "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13864,86 +13959,86 @@
 msgstr ""
 
-#: ../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 "Προσθήκη νέας πηγής στην λίστα."
 
-#: ../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 "Επιξεργασία της επιλεγμένης πηγής."
 
-#: ../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 "Διαγραφή της επιλεγμένης πηγής από την λίστα."
 
-#: ../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 "Πηγές δεδομένων"
 
-#: ../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 "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../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 ""
 
-#: ../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 "Έλεγχος για FIXMES."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
 
-#: ../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 "Διόρθωση ιδιοτήτων"
 
-#: ../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 "Δεν βρέθηκε ο τύπος του στοιχείου"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14118,17 +14213,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14179,13 +14274,13 @@
 msgstr ""
 
-#: ../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 "Ανάποδη ακτογραμμή: η ξηρά δεν είναι στην αριστερή πλευρά"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14221,7 +14316,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 "Χαρτιά που περπατάνε: {0}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14229,18 +14324,60 @@
 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 "Λήψη"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM"
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Αφαίρεση διπλών κόμβων..."
+
+#: ../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 ""
 
@@ -14248,43 +14385,4 @@
 msgid "Exception occurred"
 msgstr "Δημιοθργήθηκε εξαίρεση"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "βοήθεια"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Βοήθεια / Σχετικά"
-
-#: ../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"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14386,28 +14484,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Αυτόματη λήψη"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14418,13 +14516,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"
@@ -14432,42 +14530,42 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../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 σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../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 "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
@@ -18896,14 +18994,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Αρχαιολογικός Χώρος"
+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 "Επεξεργασία Αρχαιολογικού Χώρου"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26825,20 +26921,20 @@
 #: build/trans_wms.java:13
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
 msgid "OpenStreetMap"
-msgstr ""
+msgstr "OpenStreetMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
 msgid "TilesAtHome"
-msgstr ""
+msgstr "TilesAtHome"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
@@ -26872,36 +26968,45 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Το αρχείο δεν βρέθηκε."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Η αποστολή στο OSM API απέτυχε"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Αντικρουόμενη σχέση"
-
-#~ msgid "File not found"
-#~ msgstr "Το αρχείο δεν βρέθηκε"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
-
-#~ msgid "name"
-#~ msgstr "όνομα"
-
-#~ msgid "zoom"
-#~ msgstr "ζουμ"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
+
+#~ msgid "help"
+#~ msgstr "βοήθεια"
+
+#~ msgid "Help / About"
+#~ msgstr "Βοήθεια / Σχετικά"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Βοήθεια πρόσθετου WMS"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
+#~ "οποία πήρατε το JOSM για το πρόβλημα."
+
+#~ msgid "Unknown version"
+#~ msgstr "Άγνωστη έκδοση"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> έχει μηδενική αναφορά"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Μη αποθηκευμένες αλλαγές"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] ""
+#~ "{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
+#~ msgstr[1] ""
+#~ "{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr ""
+#~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
 
 #~ msgid ""
@@ -26913,43 +27018,4 @@
 #~ "warntime' στην διαμόρφωση.)"
 
-#~ msgid "Request Update"
-#~ msgstr "Αίτηση  Ενημέρωσης"
-
-#~ msgid "requested: {0}"
-#~ msgstr "ζητήθηκαν: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
-#~ "οποία πήρατε το JOSM για το πρόβλημα."
-
-#~ msgid "Unknown version"
-#~ msgstr "Άγνωστη έκδοση"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> έχει μηδενική αναφορά"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Μη αποθηκευμένες αλλαγές"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
-#~ msgstr[1] ""
-#~ "{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr ""
-#~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
-
 #~ msgid "Empty member in relation."
 #~ msgstr "Άδειο μέλος στη σχέση."
@@ -26964,4 +27030,7 @@
 #~ msgstr "Μετακίνηση"
 
+#~ msgid "File could not be found."
+#~ msgstr "Το αρχείο δεν βρέθηκε."
+
 #~ msgid "unnamed"
 #~ msgstr "χωρίς όνομα"
@@ -26985,6 +27054,15 @@
 #~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
 
+#~ msgid "File not found"
+#~ msgstr "Το αρχείο δεν βρέθηκε"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
+
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Επικοινωνία με τον διακομιστή OSM..."
+
+#~ msgid "name"
+#~ msgstr "όνομα"
 
 #~ msgid ""
@@ -27087,4 +27165,7 @@
 #~ msgstr "Εισαγωγή αρχείου TCX..."
 
+#~ msgid "Request Update"
+#~ msgstr "Αίτηση  Ενημέρωσης"
+
 #~ msgid "Navigation"
 #~ msgstr "Πλοήγηση"
@@ -27153,7 +27234,22 @@
 #~ msgstr "Συγγραφείς: {0}"
 
+#~ msgid "requested: {0}"
+#~ msgstr "ζητήθηκαν: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";"
 
+#~ msgid "zoom"
+#~ msgstr "ζουμ"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
+
 #~ msgid "Validate"
 #~ msgstr "Επαλήθευση"
@@ -27203,4 +27299,7 @@
 #~ msgid "Charge"
 #~ msgstr "Χρέωση"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
 
 #~ msgid ""
@@ -27242,4 +27341,7 @@
 #~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Αντικρουόμενη σχέση"
+
 #~ msgid "resolved version:"
 #~ msgstr "επιλυμένη έκδοση:"
@@ -27302,4 +27404,7 @@
 #~ msgid "Edit Information Office"
 #~ msgstr "Επεξεργασία Γραφείου Πληροφοριών"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
 
 #~ msgid ""
@@ -27329,4 +27434,7 @@
 #~ msgstr "Αποτυχία ενημέρωσης"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Η αποστολή στο OSM API απέτυχε"
+
 #~ msgid "nodes"
 #~ msgstr "κόμβοι"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 18508)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 18656)
@@ -10,7 +10,7 @@
 "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 14:04+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-14 15:40+0000\n"
+"Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"
 "Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,5 +18,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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -49,18 +49,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
@@ -70,6 +70,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
@@ -77,11 +76,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
@@ -96,4 +95,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"
@@ -120,6 +120,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
@@ -135,7 +135,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
@@ -146,7 +146,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
@@ -172,12 +172,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
@@ -189,6 +189,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 "Error"
@@ -209,6 +210,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"
@@ -320,5 +321,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
@@ -336,6 +337,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
@@ -346,5 +347,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
@@ -465,5 +466,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
@@ -505,5 +506,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
@@ -512,6 +513,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"
@@ -699,5 +701,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
@@ -710,5 +712,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"
@@ -780,5 +782,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
@@ -786,28 +796,28 @@
 msgstr "Parameter ''{0}'' must not be null"
 
-#: ../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 "There were {0} conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Conflicts during download"
 
-#: ../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}"
@@ -844,10 +854,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 "Export to 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 "Export the data to GPX file."
@@ -860,11 +870,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
@@ -895,5 +904,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
@@ -908,17 +916,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
@@ -978,5 +987,5 @@
 msgstr "Join a node into the nearest way segments"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Join Node and Line"
@@ -1007,20 +1016,19 @@
 msgstr "Please select at least two nodes to merge."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Aborting..."
-
-#: ../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 "Cannot merge nodes: Would have to delete a way that is still used."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1161,7 +1169,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Download data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1311,10 +1318,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 "Save"
 
 #: ../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 "Save the current data."
@@ -1371,10 +1378,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 "Save As..."
 
 #: ../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 "Save the current data to a new file."
@@ -1417,25 +1424,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 "Close"
 
-#: ../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 "Split Way"
 
-#: ../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 "Split a way at the selected node."
 
-#: ../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 "The current selection cannot be used for splitting."
 
-#: ../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."
@@ -1443,5 +1450,5 @@
 msgstr[1] "The selected nodes are not in the middle of any way."
 
-#: ../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 "
@@ -1457,9 +1464,9 @@
 "way also."
 
-#: ../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 "The selected nodes do not share the same way."
 
-#: ../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."
@@ -1467,10 +1474,10 @@
 msgstr[1] "The selected way does not contain all the selected nodes."
 
-#: ../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 "You must select two or more nodes to split a circular way."
 
-#: ../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 "
@@ -1480,5 +1487,5 @@
 "middle of the way.)"
 
-#: ../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 "
@@ -1488,5 +1495,5 @@
 "should verify this and correct it when necessary.</html>"
 
-#: ../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 "
@@ -1496,5 +1503,5 @@
 "this and correct it when necessary.</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"
@@ -1524,37 +1531,37 @@
 msgstr "Duplicate nodes that are used by multiple ways."
 
-#: ../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 "This node is not glued to anything else."
 
-#: ../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 "None of these nodes are glued to anything else."
 
-#: ../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 "None of this way's nodes are glued to anything else."
 
-#: ../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 "The current selection cannot be used for unglueing."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Select either:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* One tagged node, or"
 
-#: ../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 "* One node that is used by more than one way, or"
 
-#: ../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 "* One node that is used by more than one way and one of those ways, or"
 
-#: ../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"
@@ -1562,5 +1569,5 @@
 "* One way that has one or more nodes that are used by more than one way, or"
 
-#: ../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."
@@ -1568,5 +1575,5 @@
 "* One way and one or more of its nodes that are used by more than one way."
 
-#: ../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"
@@ -1580,9 +1587,9 @@
 "own copy and all nodes will be selected."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Unglued Node"
 
-#: ../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"
@@ -1590,5 +1597,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"
@@ -1629,12 +1636,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Updates the objects in the current data layer from the 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 "Download data"
@@ -1650,5 +1656,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Update selections"
 
@@ -1664,5 +1671,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "There are no selected primitives to update."
 
@@ -1670,4 +1678,9 @@
 msgid "Selection empty"
 msgstr "Selection empty"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Update selections"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1677,7 +1690,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 all changes in the current data layer to the OSM server"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1817,29 +1829,24 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Change {0} object"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1956,9 +1963,9 @@
 msgstr "Downloaded GPX Data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Downloading data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1967,5 +1974,5 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 
-#: ../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 "No data found in this area."
@@ -1981,16 +1988,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "visible (on the server)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2000,7 +2003,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Cancel the upload and resume editing"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2024,7 +2026,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "The following errors occurred during mass download:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2034,7 +2036,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Errors during Download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2048,5 +2049,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
@@ -2079,6 +2080,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 "selected"
@@ -2096,26 +2097,26 @@
 msgstr "Add node into way"
 
-#: ../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 "Connect existing way to node"
 
-#: ../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 "Add a new node to an existing way"
 
-#: ../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 "Add node into way and connect"
 
-#: ../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 "Create new node."
 
-#: ../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 "Select node under 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."
@@ -2124,46 +2125,44 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../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 new way from last 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 "Continue way from last node."
 
-#: ../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 "Finish drawing."
 
-#: ../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 "Extrude"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Create areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Extrude Way"
 
-#: ../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 "Release the mouse button to select the objects in the rectangle."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Draw a rectangle of the desired size, then release the mouse button."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Draw a rectangle of the desired size, then release the mouse button."
 
-#: ../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 "Release the mouse button to stop rotating."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Drag a way segment to make a rectangle."
 
@@ -2223,4 +2222,8 @@
 msgstr "Always move and don't show dialogue again"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Release the mouse button to select the objects in the rectangle."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2228,4 +2231,8 @@
 msgstr ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Release the mouse button to stop rotating."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2255,67 +2262,70 @@
 "move zoom with right button"
 
-#: ../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 "Search..."
 
-#: ../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 "Search for objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Can't search because there is no loaded data."
-
-#: ../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 "Please enter a filter string."
 
-#: ../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 "Please enter a search string."
 
-#: ../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 "regular expression"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "replace selection"
 
-#: ../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 "add to selection"
 
-#: ../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 "remove from selection"
 
-#: ../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 "find in selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "case sensitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regular expression"
 
-#: ../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>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 
-#: ../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:Bak</b> - 'Bak' anywhere in the name."
 
-#: ../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> - key 'type' with value exactly '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>, "
@@ -2325,17 +2335,17 @@
 "<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:Bak</b> - not 'Bak' in the name."
 
-#: ../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> - key=foot set to any value."
 
-#: ../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>Special targets:</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>)"
@@ -2343,40 +2353,39 @@
 "<b>type:</b> - type of the object (<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>user:</b>... - all objects changed by user"
 
-#: ../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 "<b>id:</b>... - object with given ID (0 for new objects)"
 
-#: ../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 with given number of nodes"
 
-#: ../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 with given number of nodes"
-
-#: ../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> - all changed objects"
 
-#: ../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> - all selected objects"
 
-#: ../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> - all incomplete objects"
 
-#: ../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>untagged</b> - all untagged objects"
 
-#: ../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"
@@ -2384,5 +2393,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../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"
@@ -2390,17 +2399,17 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../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 "Use <b>|</b> or <b>OR</b> to combine with logical 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 "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 
-#: ../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 "Use <b>(</b> and <b>)</b> to group expressions"
 
-#: ../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
@@ -2410,51 +2419,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 "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Submit filter"
 
-#: ../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 Search"
 
-#: ../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 "No match found for ''{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 "Nothing added to selection by searching for ''{0}''"
 
-#: ../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 "Nothing removed from selection by searching for ''{0}''"
 
-#: ../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 "Nothing found in selection by searching for ''{0}''"
 
-#: ../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 "Found {0} matches"
 
-#: ../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"
@@ -2503,16 +2512,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Wrong number of parameters for nodes operator."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2637,6 +2643,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
@@ -2765,5 +2771,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 ""
@@ -2785,9 +2791,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}'' must not be empty"
+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"
@@ -2823,5 +2832,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 "Split way segment"
@@ -2829,6 +2838,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."
@@ -2840,5 +2849,5 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Delete confirmation"
@@ -2849,5 +2858,15 @@
 msgstr "Resolve conflicts in deleted state 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"
@@ -2932,5 +2951,5 @@
 msgstr "Resolve {0} tag conflicts in relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3035,10 +3054,16 @@
 #, java-format
 msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+msgstr "Exactly four doubles expected in string, got {0}"
+
+#: ../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 "Default value is ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3178,9 +3203,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
 msgstr ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3239,5 +3262,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
@@ -3251,5 +3274,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 ""
@@ -3258,4 +3281,43 @@
 "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 "Missing argument for not."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "History for relation {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"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. "
 
 #. translators notes must be in front
@@ -3312,33 +3374,34 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {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 "expected id >= 0. Got {0}"
 
-#: ../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 "a primitive with id=0 can't be invisible"
 
-#: ../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 "ID > 0 expected. Got {0}."
 
-#: ../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 "version > 0 expected. Got {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3364,45 +3427,28 @@
 "multiple values"
 
-#: ../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 "Cannot add node {0} to incomplete way {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "There's no primitive with version {0} in this history"
-
-#: ../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 "There's no version valid at date ''{0}'' in this history"
-
-#: ../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}'' > 0 expected. Got ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "no earliest version found. History is empty."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "no latest version found. History is empty."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr "No type found. History is empty."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "Didn't find an primitive with id {0} in this dataset"
-
-#: ../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 "Didn't find an primitive with id {0} and version {1} in this dataset"
-
-#: ../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
@@ -3413,6 +3459,7 @@
 msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 
@@ -3423,148 +3470,145 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../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 "Area style way is not closed."
 
-#: ../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 "multipolygon way ''{0}'' is not closed."
 
-#: ../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 "Deleted member ''{0}'' in relation."
 
-#: ../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 "Way ''{0}'' with less than two points."
 
-#: ../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 "More than one \"from\" way found."
 
-#: ../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 "More than one \"to\" way found."
 
-#: ../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 "More than one \"via\" found."
 
-#: ../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 "Unknown role ''{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 "Unknown member type for ''{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 "No \"from\" way found."
 
-#: ../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 "No \"to\" way found."
 
-#: ../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 "No \"via\" node or way found."
 
-#: ../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 "The \"from\" way doesn't start or end at a \"via\" node."
 
-#: ../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 "The \"to\" way doesn't start or end at a \"via\" node."
 
-#: ../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 "The \"from\" way doesn't start or end at the \"via\" way."
 
-#: ../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 "The \"to\" way doesn't start or end at the \"via\" way."
 
-#: ../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 "Style for restriction {0} not found."
 
-#: ../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 "Intersection between ways ''{0}'' and ''{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 "Inner way ''{0}'' is outside."
 
-#: ../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 "No useful role ''{0}'' for Way ''{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 "Non-Way ''{0}'' in multipolygon."
 
-#: ../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 "No outer way for multipolygon ''{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 "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../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 "Style for outer way ''{0}'' mismatches."
 
-#: ../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 "untagged"
 
-#: ../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 "text"
 
-#: ../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 ""
-"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. "
-
-#: ../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 "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inactive"
 
-#: ../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
@@ -3574,5 +3618,5 @@
 msgstr[1] "nodes"
 
-#: ../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
@@ -3582,6 +3626,6 @@
 msgstr[1] "ways"
 
-#: ../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
@@ -3591,13 +3635,13 @@
 msgstr[1] "relations"
 
-#: ../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 "untagged way"
 
-#: ../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 way"
 
-#: ../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
@@ -3605,5 +3649,5 @@
 msgstr "background"
 
-#: ../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 "highlight"
@@ -3688,5 +3732,5 @@
 msgstr "Do not show again"
 
-#: ../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
@@ -3694,32 +3738,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 "incomplete"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "highway"
 
-#: ../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 "railway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "waterway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "landuse"
 
-#: ../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"
@@ -3728,5 +3772,5 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3735,33 +3779,33 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Precondition violation"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Security exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Network exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "IO Exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Not Found"
 
-#: ../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
@@ -3769,9 +3813,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 "Unknown host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Object deleted"
@@ -3793,7 +3837,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Close the dialogue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3994,5 +4037,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 "Edit"
@@ -4120,10 +4163,10 @@
 msgstr "User:"
 
-#: ../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 "layer not in list."
 
-#: ../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"
@@ -4131,7 +4174,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "No, cancel operation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4254,5 +4296,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"
@@ -4261,5 +4303,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"
@@ -4269,5 +4311,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 "Members"
@@ -4724,5 +4766,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 "No, abort"
@@ -4785,6 +4827,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 "<undefined>"
@@ -4887,7 +4927,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Conflicts when merging nodes - merged node is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -4913,4 +4953,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"
@@ -5007,5 +5048,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"
@@ -5016,5 +5057,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"
@@ -5033,12 +5074,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Keep mine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Remove this relation member from the relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5057,12 +5096,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Sets a role for the selected members"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Tag modified relations with   "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5078,7 +5115,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5145,5 +5181,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
@@ -5243,5 +5279,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"
@@ -5297,11 +5333,11 @@
 msgstr "Display the history of all selected items."
 
-#: ../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 "Object with history"
 
-#: ../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
@@ -5309,13 +5345,13 @@
 msgstr "Reload"
 
-#: ../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 "Reload all currently selected objects and refresh the list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Show"
 
-#: ../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 "Display the history of the selected objects."
@@ -5372,7 +5408,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] "This will change up to {0} object."
@@ -5380,5 +5415,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 "An empty value deletes the key."
 
@@ -5403,4 +5439,11 @@
 msgstr[1] "Change properties of up to {0} objects"
 
+#: ../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] "This will change up to {0} object."
+msgstr[1] "This will change up to {0} objects."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5477,60 +5520,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 "Relations"
 
-#: ../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 "Open a list of all relations."
 
-#: ../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 "Relations: {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 "Open an editor for the selected relation"
 
-#: ../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 "Delete the selected relation"
 
-#: ../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 "Create a new relation"
 
-#: ../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 "Create a copy of this relation and open it in another editor window"
 
-#: ../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 "Set the current selection to the list of selected relations"
 
-#: ../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 "Delete the selected relation"
-
-#: ../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 "Select either:"
-
-#: ../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 "Download selected relations"
-
-#: ../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 "Download Members"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5595,5 +5634,6 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] "{0} Author"
+msgstr[0] "{0} Autore"
+msgstr[1] "{0} Autori"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5690,5 +5730,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}"
@@ -5953,18 +5993,19 @@
 msgstr "Edit the relation the currently selected relation member refers to"
 
-#: ../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 "Zoom to"
 
-#: ../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"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
 msgstr "Zoom to primitive the first selected member refers to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zooming disabled because layer of this relation is not active"
 
-#: ../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 "Zooming disabled because there is no selected member"
@@ -5987,5 +6028,5 @@
 msgstr "Value of child.getId() > 0 expected. Got {1}."
 
-#: ../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}"
@@ -6068,12 +6109,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Create boundary"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Edit the currently selected relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6084,7 +6123,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 "Please enter a name for the location."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6094,12 +6132,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Move the currently selected members up"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Move the currently selected members up"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6159,7 +6195,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Split a way at the selected node."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6168,7 +6203,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "The selected way does not contain the selected node."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6192,7 +6226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "No relation is selected"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6209,12 +6242,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Edit the currently selected relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Please select the row to edit."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6230,7 +6261,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Enter a place name to search for:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6244,12 +6274,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Search..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Direction to search for land"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7179,7 +7207,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "near"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7227,5 +7254,5 @@
 msgstr "JOSM Help Browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7239,5 +7266,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 ""
@@ -7248,5 +7275,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 ""
@@ -7255,19 +7282,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 "Open the current help page in an external browser"
 
 #. 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 "Edit the current help page"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7277,32 +7304,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 "Reload the current help page"
 
 #. 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 ""
@@ -7324,37 +7351,37 @@
 msgstr "Longitude: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr "Coordinates"
 
-#: ../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 "History for node {0}"
 
-#: ../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 "History for way {0}"
 
-#: ../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 "History for relation {0}"
 
-#: ../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 "Close the dialogue"
 
-#: ../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 "Reload the history from the server"
 
-#: ../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 "history not initialised yet. Failed to set reference primitive."
 
-#: ../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 ""
@@ -7363,5 +7390,5 @@
 "Failed to set reference. Reference ID {0} does not match history ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7370,9 +7397,9 @@
 "failed to set reference. reference version {0} not available in history"
 
-#: ../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 "history not initialised yet. Failed to set current primitive."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7381,24 +7408,34 @@
 msgstr "failed to set current. current version {0} not available in history"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Load history"
 
-#: ../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}'' > 0 expected. Got ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "id parameter ''{0}'' > 0 required. Got {1}"
+
+#: ../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 "Loading history for node {0}"
 
-#: ../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 "Loading history for way {0}"
 
-#: ../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}"
@@ -7411,4 +7448,22 @@
 msgstr "Node {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoom to problem"
+
+#: ../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 "Load history"
+
+#: ../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
@@ -7421,18 +7476,69 @@
 msgstr "Relation {0}"
 
-#: ../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 "Sort presets menu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "User"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr "Changeset"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
-#, java-format
-msgid ""
+#. 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 "unknown"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></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 ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "Anonymous"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7457,4 +7563,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} created on {1} by {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "deleted"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Version {0} created on {1} by {2}"
 
@@ -7819,9 +7940,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] "{0} object to modifiy:"
-msgstr[1] "{0} objects to modify:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7903,13 +8024,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 "Load the list of your open changesets from the server"
 
-#: ../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 "Close the currently selected open changeset"
 
-#: ../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
@@ -7982,5 +8103,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}..."
@@ -7992,5 +8113,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 Images"
@@ -8016,5 +8137,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"
@@ -8069,43 +8190,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 point"
 
 #: ../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 "Customise line drawing"
 
 #: ../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 "Use global settings."
 
 #: ../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 "Draw lines between points for this layer."
 
 #: ../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 "Do not draw lines between points for this layer."
 
 #: ../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 "Select line drawing options"
 
 #: ../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 "Customise Colour"
 
 #: ../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"
@@ -8113,6 +8234,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"
@@ -8202,10 +8323,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 "Convert to data layer"
 
-#: ../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."
@@ -8215,43 +8336,43 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../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 "Converted from: {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 "Download from OSM along this track"
 
-#: ../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 "Download everything within:"
 
-#: ../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} metres"
 
-#: ../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 area per request:"
 
-#: ../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} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8262,9 +8383,9 @@
 "wish<br>to continue?</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 "No GPX track available in layer to associate audio with."
 
-#: ../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 "
@@ -8274,5 +8395,5 @@
 "the end were omitted or moved to the start."
 
-#: ../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 "
@@ -8308,5 +8429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8317,12 +8438,8 @@
 "server."
 msgstr[0] ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
 msgstr[1] ""
-"{0} objects have been purged from the local dataset because they are deleted "
-"on the server."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8332,42 +8449,39 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
-"Please consult the Conflict List Dialogue<br>and manually resolve them."
 msgstr[1] ""
-"Please consult the Conflict List Dialogue<br>and manually resolve them."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Close this dialogue and resume editing in JOSM"
-
-#: ../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} deleted.)"
-msgstr[1] " ({0} deleted.)"
-
-#: ../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} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "unset"
 
-#: ../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 version: {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 "Convert to GPX layer"
 
-#: ../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."
@@ -8377,5 +8491,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8384,5 +8498,5 @@
 msgstr[1] "tracks"
 
-#: ../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"
@@ -8390,5 +8504,5 @@
 msgstr[1] "points"
 
-#: ../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"
@@ -8397,5 +8511,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../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"
@@ -8404,5 +8518,5 @@
 msgstr[1] "{0} consists of {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"
@@ -8411,9 +8525,9 @@
 msgstr[1] "{0} points"
 
-#: ../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"
@@ -8421,5 +8535,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"
@@ -8428,9 +8542,9 @@
 msgstr[1] "{0} consists of {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 "Synchronise Audio"
 
-#: ../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."
@@ -8438,5 +8552,5 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../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
@@ -8444,14 +8558,14 @@
 msgstr "Audio synchronised at point {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 "Unable to synchronise in layer being played."
 
-#: ../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 "Make Audio Marker at Play Head"
 
-#: ../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 "
@@ -8461,13 +8575,13 @@
 "marker."
 
-#: ../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 "No existing audio markers in this layer to offset from."
 
-#: ../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 "Show/Hide Text/Icons"
 
-#: ../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 "Toggle visible state of the marker text and icons."
@@ -8535,5 +8649,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 "Please select the row to edit."
@@ -8547,5 +8661,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."
@@ -9241,7 +9355,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Activate"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9284,17 +9397,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Remove the selected entries from the list of merged elements"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Edit the value of the selected key for all objects"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Remove the selected entries from the list of merged elements"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9304,36 +9414,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Add a new tag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Close the selected open changesets"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Edit the selected source."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Loading history for node {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
-msgstr "<html>Failed to load history from the server. Details:<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -9961,5 +10067,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}''."
@@ -9986,5 +10092,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}."
@@ -9992,5 +10098,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}"
@@ -10003,5 +10109,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}''."
@@ -10163,5 +10269,5 @@
 msgstr "File \"{0}\" does not exist"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10170,38 +10276,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 ""
@@ -10209,19 +10315,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> specification with 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 "Illegal object with 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 ""
@@ -10232,9 +10338,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 ""
@@ -10244,25 +10350,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 ""
@@ -10270,5 +10376,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10277,5 +10383,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10283,5 +10389,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10290,13 +10396,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 "Prepare OSM data..."
 
-#: ../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 ""
@@ -10447,9 +10553,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 successfully downloaded. Please restart JOSM."
-msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10512,7 +10618,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Update Plugins"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10655,35 +10760,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 "unknown"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11325,47 +11399,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 "Extracting GPS locations from EXIF"
 
-#: ../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 "Starting directory scan"
 
-#: ../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 "One of the selected files was null !!!"
-
-#: ../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 "Read photos..."
 
-#: ../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 "Unable to get canonical path for directory {0}\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 "Scanning directory {0}"
 
-#: ../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 "Found null file in directory {0}\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 "Error while getting files from directory {0}\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 "Correlate to GPX"
 
-#: ../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."
@@ -11381,24 +11454,24 @@
 msgstr "Load set of images as a new layer."
 
-#: ../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 Files (*.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 "File {0} is loaded yet under the name \"{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 "Error while parsing {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 "Could not read \"{0}\""
 
-#: ../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."
@@ -11410,34 +11483,34 @@
 "on the photo and select a timezone<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 "Photo time (from 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 time (read from the above photo): "
 
-#: ../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 "I'm in the timezone of: "
 
-#: ../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 "No date"
 
-#: ../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 an other photo"
 
-#: ../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 "Synchronise time from a photo of the GPS receiver"
 
-#: ../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"
@@ -11447,70 +11520,70 @@
 "Please use the requested format"
 
-#: ../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 "Invalid date"
 
-#: ../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 "<No GPX track loaded yet>"
 
-#: ../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 "Open another GPX trace"
 
-#: ../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 "Timezone: "
 
-#: ../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 "Offset:"
 
-#: ../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>I can take a picture of my GPS receiver.<br>Can this help?</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 "Update position for: "
 
-#: ../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 "All images"
 
-#: ../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 "Images with no exif position"
 
-#: ../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 "Not yet tagged images"
 
-#: ../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 "Correlate images with GPX track"
 
-#: ../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 "Correlate"
 
-#: ../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 "Auto-Guess"
 
-#: ../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 "You should select a GPX track"
 
-#: ../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 "No selected GPX track"
 
-#: ../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 ""
@@ -11521,9 +11594,9 @@
 "Expected format: {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 "Invalid timezone"
 
-#: ../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 ""
@@ -11534,26 +11607,26 @@
 "Expected format: {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 "Invalid offset"
 
-#: ../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 "Found {0} matches of {1} 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 loaded"
 
-#: ../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 "The selected photos don't contain time information."
 
-#: ../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 "Photos don't contain time information"
 
-#: ../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."
@@ -11561,39 +11634,39 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 
-#: ../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 has no time information"
 
-#: ../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 "Timezone: {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 "Minutes: {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 "Seconds: {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 "Matched {0} of {1} photos to 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 "(Time difference of {0} days)"
 
-#: ../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 "Offset between track and photos: {0}m {1}s"
 
-#: ../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 "
@@ -11603,13 +11676,13 @@
 "adjust the sliders to manually match the photos."
 
-#: ../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 "Matching photos to track failed"
 
-#: ../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 "Adjust timezone and offset"
 
-#: ../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 "Default Values"
@@ -11630,5 +11703,5 @@
 msgstr "Error on file {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11641,37 +11714,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 "Error loading file"
 
-#: ../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 "Lambert Zone 1 cache file (.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 "Lambert Zone 2 cache file (.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 "Lambert Zone 3 cache file (.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 "Lambert Zone 4 cache file (.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: Illegal url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11683,18 +11756,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 "Select commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Choose from..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
@@ -11725,34 +11798,34 @@
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 
-#: ../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 "Replace original background by JOSM background colour."
 
-#: ../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 "Reverse grey colours (for black backgrounds)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Set background transparent."
 
-#: ../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 "Draw boundaries of downloaded data."
 
-#: ../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 "Enable automatic caching."
 
-#: ../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. cache size (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."
@@ -11770,18 +11843,18 @@
 "by this plugin."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "French cadastre 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 "<html>Value of key \"source\" when autosourcing is enabled</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Source"
 
-#: ../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 "
@@ -11791,5 +11864,5 @@
 "preferences."
 
-#: ../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). "
@@ -11799,74 +11872,74 @@
 "Useful for texts on dark backgrounds."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Allows multiple layers stacking"
 
-#: ../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 "Set WMS layers transparency. Right is opaque, left is transparent."
 
-#: ../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 "Draw a rectangle around downloaded data from WMS server."
 
 #. 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 "Grab smaller images (higher quality but use more memory)"
 
-#: ../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 "Fixed size square (default 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 "Fixed size (from 25 to 1000 metres)"
 
-#: ../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 "Oldest files are automatically deleted when this size is exceeded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Auto-tag source added:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Add \"source=...\" to elements?"
 
-#: ../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 "Downloading {0}"
 
-#: ../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 "Contacting WMS Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Create buildings"
 
-#: ../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"
@@ -11876,30 +11949,30 @@
 "building import size is limited to 1 km2 max."
 
-#: ../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 "Please, enable auto-sourcing and check 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 "Extract SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Extract best fitting boundary..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Create boundary"
 
-#: ../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"
@@ -11907,29 +11980,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 "Extract commune boundary"
 
-#: ../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 "Only on vectorised layers"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Extract building footprints"
 
-#: ../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 "Download Image from French Cadastre WMS"
 
-#: ../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"
@@ -11938,13 +12011,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"
@@ -11952,5 +12025,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"
@@ -11958,14 +12031,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"
@@ -11973,14 +12046,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"
@@ -11988,64 +12061,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 "Load location from cache (only if cache is enabled)"
 
-#: ../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 "Change location"
 
-#: ../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 "Set a new location for the next request"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Add a new layer"
 
-#: ../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 "Location"
 
-#: ../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 "
@@ -12055,25 +12128,25 @@
 "known by 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 "Add new layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Reset cookie"
 
-#: ../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 "Get a new cookie (session timeout)"
 
-#: ../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
@@ -12083,14 +12156,14 @@
 msgstr[1] "Simplify Way (remove {0} nodes)"
 
-#: ../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 "Adjust WMS"
 
-#: ../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 "Adjust the position of the WMS layer (raster images only)"
 
-#: ../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"
@@ -12098,5 +12171,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
@@ -12104,5 +12177,5 @@
 msgstr "Download WMS tile from {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"
@@ -12112,34 +12185,34 @@
 "Select one of them first, then retry"
 
-#: ../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 "Blank Layer"
 
-#: ../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 layer ({0}), {1} tile(s) loaded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../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 vectorised."
 
-#: ../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 "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12150,18 +12223,18 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../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 "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12271,9 +12344,9 @@
 msgstr "Create duplicate way"
 
-#: ../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 "Layer for editing GPX tracks"
 
-#: ../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 "Convert to GPX layer with anonymised time"
@@ -12290,11 +12363,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 "Import path from GPX layer"
 
 #: ../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 "Drop existing path"
@@ -12304,5 +12377,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 "No GPX data layer found."
@@ -12515,5 +12588,5 @@
 msgstr "Display non-geotagged photos"
 
-#: ../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 "Imported Images"
@@ -12942,5 +13015,5 @@
 msgstr "Angle between two selected Nodes"
 
-#: ../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 "Layer to make measurements"
@@ -13019,5 +13092,5 @@
 msgstr "OpenStreetBugs download loop"
 
-#: ../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 "Displays OpenStreetBugs issues"
@@ -13161,7 +13234,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Layer"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13328,43 +13400,41 @@
 msgstr "Enter weight values"
 
-#: ../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 Map"
 
-#: ../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 "Load Tile"
 
-#: ../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 "Show info"
-
-#: ../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 "Load All Tiles"
 
-#: ../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 "Increase zoom"
 
-#: ../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 "Decrease zoom"
 
-#: ../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 "Flush Tile Cache"
 
-#: ../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 "image "
@@ -13400,7 +13470,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max zoom lvl: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13753,6 +13822,6 @@
 msgstr "Are you sure?"
 
-#: ../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
@@ -13760,5 +13829,5 @@
 msgstr "Validation errors"
 
-#: ../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 "No validation errors"
@@ -13849,5 +13918,5 @@
 msgstr "validation other"
 
-#: ../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}"
@@ -13947,7 +14016,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Unordered coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13977,18 +14045,18 @@
 msgstr "Crossing ways"
 
-#: ../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 "Duplicated nodes"
 
-#: ../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 "This test checks that there are no nodes at the very same location."
 
-#: ../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 "Confirmation"
@@ -14146,80 +14214,80 @@
 #. 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 "Painting problem"
 
-#: ../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 "Key ''{0}'' invalid."
 
-#: ../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 with empty values"
 
-#: ../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 "Invalid property key"
 
-#: ../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 "Invalid white space in property key"
 
-#: ../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 "Property values start or end with white space"
 
-#: ../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 "Property values contain HTML entity"
 
-#: ../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 "Key ''{0}'' not in presets."
 
-#: ../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 "Presets do not contain property key"
 
-#: ../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 "Value ''{0}'' for key ''{1}'' not in presets."
 
-#: ../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 "Presets do not contain property value"
 
-#: ../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 "FIXMES"
 
-#: ../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 "Check property keys."
 
-#: ../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 "Validate that property keys are valid checking against list of words."
 
-#: ../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 "Use complex property checker."
 
-#: ../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 "Validate property values and tags using complex rules."
 
-#: ../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 "TagChecker source"
 
-#: ../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."
@@ -14229,86 +14297,86 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 
-#: ../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 "Add a new source to the list."
 
-#: ../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 "Edit the selected source."
 
-#: ../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 "Delete the selected source from the list."
 
-#: ../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 "Data sources"
 
-#: ../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 "Check property values."
 
-#: ../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 "Validate that property values are valid checking against 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 "Check for FIXMES."
 
-#: ../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 "Looks for nodes or ways with FIXME in any property value."
 
-#: ../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 "Check for paint notes."
 
-#: ../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 "Check if map painting found data errors."
 
-#: ../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 "Use default data file."
 
-#: ../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 "Use the default data file (recommended)."
 
-#: ../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 "Use default tag ignore file."
 
-#: ../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 "Use the default tag ignore file (recommended)."
 
-#: ../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 "Use default spellcheck file."
 
-#: ../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 "Use the default spellcheck file (recommended)."
 
-#: ../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 "Fix properties"
 
-#: ../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 "Could not find element type"
 
-#: ../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 "Could not find warning level"
 
-#: ../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 "Illegal expression ''{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}''"
@@ -14483,17 +14551,17 @@
 msgstr "This test checks if a way has an endpoint very near to another way."
 
-#: ../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 "Way end node near other highway"
 
-#: ../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 "Way end node near other way"
 
-#: ../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 "Way node near other way"
 
-#: ../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 "Connected way end node near other way"
@@ -14544,13 +14612,13 @@
 msgstr "This test checks the direction of water, land and coastline ways."
 
-#: ../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 "Reversed coastline: land not on left side"
 
-#: ../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 "Reversed water: land not on left side"
 
-#: ../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 "Reversed land: land not on left side"
@@ -14588,7 +14656,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 layer ({0}), downloading in zoom {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14596,84 +14664,67 @@
 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 "Select a starting node on the end of a way"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Reached the end of the line"
-
-#. 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"
-msgstr "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 "Download"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Download map data from the 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>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</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 "Removing duplicate nodes..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Exception occurred"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "help"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Help / About"
-
-#: ../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 ""
-"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."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "WMS Plugin Help"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14779,28 +14830,28 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../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 layer ({0}), automatically downloading in zoom {1}"
 
-#: ../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 layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14815,13 +14866,13 @@
 "tiles anyway?"
 
-#: ../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"
@@ -14829,42 +14880,42 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../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 "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "File Format Error"
@@ -19330,14 +19381,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Archaeological Site"
+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 "Edit Archaeological Site"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27306,74 +27355,245 @@
 msgstr ""
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Can't search because there is no loaded data."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "There's no primitive with version {0} in this history"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "There's no version valid at date ''{0}'' in this history"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "no earliest version found. History is empty."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "no latest version found. History is empty."
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "No type found. History is empty."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Didn't find an primitive with id {0} in this dataset"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Didn't find an primitive with id {0} and version {1} in this dataset"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Select a starting node on the end of a way"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Reached the end of the line"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Reached a junction"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "Help / About"
+#~ msgstr "Help / About"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "WMS Plugin Help"
+
+#~ msgid "Move"
+#~ msgstr "Move"
+
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "No data imported."
+#~ msgstr "No data imported."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Please enter the desired coordinates first."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Select a bookmark first."
+
 #~ msgid "File could not be found."
 #~ msgstr "File could not be found."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Please select at least one task to download"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload to OSM API failed"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflicting relation"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
+#~ msgid "No document open so nothing to save."
+#~ msgstr "No document open so nothing to save."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Unknown file extension."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Refresh the selection list."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Merging conflicts."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolve Conflicts"
+
+#~ msgid "Object"
+#~ msgstr "Object"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "There were conflicts during import."
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Hint: Some changes came from uploading new data to the server."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Unsaved Changes"
+
+#~ msgid "my version:"
+#~ msgstr "my version:"
+
+#~ msgid "their version:"
+#~ msgstr "their version:"
+
+#~ msgid "resolved version:"
+#~ msgstr "resolved version:"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contacting the OSM server..."
 
 #~ msgid "Error while parsing"
 #~ msgstr "Error while parsing"
 
-#~ msgid "File not found"
-#~ msgstr "File not found"
-
-#~ msgid "Replace"
-#~ msgstr "Replace"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Replace the way this member refers to with the combined way"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Please enter the desired coordinates first."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Select a bookmark first."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Please enter a search string"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Cannot read place search results from server"
-
-#~ msgid "name"
-#~ msgstr "name"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copy defaults"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Please select the row to copy."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "The XML source (URL or filename) for {0} definition files."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Add a new XML source to the list."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Defaults (See tooltip for detailed information)"
+#~ msgid "Unknown version"
+#~ msgstr "Unknown version"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "different"
+
+#~ msgid "true"
+#~ msgstr "true"
+
+#~ msgid "false"
+#~ msgstr "false"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Resolve {0} conflicts in {1} objects"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "unnamed"
+#~ msgstr "unnamed"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Cannot open preferences directory: {0}"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} object has conflicts:"
+#~ msgstr[1] "{0} objects have conflicts:"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Can only edit help pages from JOSM Online Help"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Click Reload to refresh list"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Revert"
+#~ msgstr "Revert"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Station"
+#~ msgstr "Station"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM username (e-mail)"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Found <nd> element in non-way."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> has zero ref"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Plugin requires JOSM update: {0}."
+
+#~ msgid "Commit comment"
+#~ msgstr "Commit comment"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
 
 #~ msgid ""
@@ -27384,162 +27604,4 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 
-#~ msgid "Show Tile Status"
-#~ msgstr "Show Tile Status"
-
-#~ msgid "Request Update"
-#~ msgstr "Request Update"
-
-#~ msgid "error loading metadata"
-#~ msgstr "error loading metadata"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "error requesting update: not zoom-level 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "requested: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "error requesting update"
-
-#~ msgid "Move"
-#~ msgstr "Move"
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "No data imported."
-#~ msgstr "No data imported."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "No document open so nothing to save."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Unknown file extension."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refresh the selection list."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Merging conflicts."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolve Conflicts"
-
-#~ msgid "Object"
-#~ msgstr "Object"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "There were conflicts during import."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Hint: Some changes came from uploading new data to the server."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Unsaved Changes"
-
-#~ msgid "my version:"
-#~ msgstr "my version:"
-
-#~ msgid "their version:"
-#~ msgstr "their version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "resolved version:"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contacting the OSM server..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Unknown version"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "different"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolve {0} conflicts in {1} objects"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "unnamed"
-#~ msgstr "unnamed"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Cannot open preferences directory: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object has conflicts:"
-#~ msgstr[1] "{0} objects have conflicts:"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Can only edit help pages from JOSM Online Help"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Click Reload to refresh list"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "Revert"
-#~ msgstr "Revert"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM username (e-mail)"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Found <nd> element in non-way."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> has zero ref"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin requires JOSM update: {0}."
-
-#~ msgid "Commit comment"
-#~ msgstr "Commit comment"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
-
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -27568,4 +27630,7 @@
 #~ msgid "Cannot connect to server."
 #~ msgstr "Cannot connect to server."
+
+#~ msgid "name"
+#~ msgstr "name"
 
 #~ msgid "Tagging preset sources"
@@ -27595,4 +27660,7 @@
 #~ msgstr "Could not download plugin: {0} from {1}"
 
+#~ msgid "File not found"
+#~ msgstr "File not found"
+
 #~ msgid "Rotate"
 #~ msgstr "Rotate"
@@ -27600,4 +27668,7 @@
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Delete {1} {0}"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflicting relation"
 
 #~ msgid "EPSG:4326"
@@ -27655,7 +27726,16 @@
 #~ msgstr "Please select ways with almost right angles to orthogonalise."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Please select at least one task to download"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Really mark this issue as ''done''?"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Please enter a search string"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Cannot read place search results from server"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "Import TCX File..."
@@ -27663,4 +27743,7 @@
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "Import TCX file as GPS track"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
 
 #~ msgid ""
@@ -27677,4 +27760,19 @@
 #~ msgstr "Validate either current selection or complete dataset."
 
+#~ msgid "Request Update"
+#~ msgstr "Request Update"
+
+#~ msgid "error loading metadata"
+#~ msgstr "error loading metadata"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Show Tile Status"
+
+#~ msgid "requested: {0}"
+#~ msgstr "requested: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "error requesting update"
+
 #~ msgid "Metacarta Map Rectifier image id"
 #~ msgstr "Metacarta Map Rectifier image id"
@@ -27682,4 +27780,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Please select the row to copy."
 
 #~ msgid "Copy Default"
@@ -28136,4 +28237,7 @@
 #~ msgstr "Conflict detected"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload to OSM API failed"
+
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -28194,4 +28298,19 @@
 #~ msgstr "Remove relation member {0} {1}"
 
+#~ msgid "Copy defaults"
+#~ msgstr "Copy defaults"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Add a new XML source to the list."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "The XML source (URL or filename) for {0} definition files."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Defaults (See tooltip for detailed information)"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "error requesting update: not zoom-level 12"
+
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "Download referrers from OSM..."
@@ -28289,4 +28408,18 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -28330,4 +28463,10 @@
 #~ "''{1}''"
 
+#~ msgid "Replace"
+#~ msgstr "Replace"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Replace the way this member refers to with the combined way"
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Preset group ''{0}'' of group ''{1}''"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 18508)
+++ applications/editors/josm/i18n/po/es.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-06 22:15+0000\n"
-"Last-Translator: Pablo Zubiaurre <pablozub89@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-16 19:38+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\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:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:08+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,7 +93,8 @@
 #: ../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"
-msgstr "Advertencia"
+msgstr "Aviso"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:451
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "Error"
@@ -208,6 +209,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"
@@ -321,5 +322,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
@@ -337,6 +338,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
@@ -347,5 +348,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
@@ -465,5 +466,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
@@ -505,5 +506,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
@@ -512,6 +513,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"
@@ -699,5 +701,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
@@ -710,5 +712,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"
@@ -769,5 +771,5 @@
 #, java-format
 msgid "Id > 0 required, got {0}"
-msgstr ""
+msgstr "Requreido ID > 0, obtenido {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
@@ -783,5 +785,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
@@ -789,28 +799,28 @@
 msgstr "El parámetro''{0}'' no debe ser nulo"
 
-#: ../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 "Existió {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Conflictos durante la descarga"
 
-#: ../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}"
@@ -847,10 +857,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 "Exportar a 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 "Exportar los datos a archivo GPX"
@@ -863,11 +873,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
@@ -898,5 +907,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
@@ -911,17 +919,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
@@ -983,5 +992,5 @@
 msgstr "Unir un nodo al segmento de vía más cercano"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Unir nodo y línea"
@@ -1012,22 +1021,19 @@
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Abortando..."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr "Abortar fusión"
+
+#: ../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
+msgstr "Clic para anular la fusión de nodos"
+
+#: ../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 ""
-"No se pueden unir los nodos: Habría que borrar una vía que todavía está en "
-"uso."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1168,5 +1174,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
 msgstr "Descargar datos"
@@ -1324,10 +1329,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 "Guardar"
 
 #: ../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 "Guardar los datos actuales."
@@ -1384,10 +1389,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 "Guardar como..."
 
 #: ../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 "Guardar los datos actuales en un nuevo archivo."
@@ -1431,25 +1436,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 "Cerrar"
 
-#: ../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 "Separar vía"
 
-#: ../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 "Separar vía por el nodo seleccionado"
 
-#: ../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 "La selección actual no se puede usar para separar."
 
-#: ../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."
@@ -1457,5 +1462,5 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../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 "
@@ -1471,9 +1476,9 @@
 "seleccione la vía también."
 
-#: ../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 "Los nodos seleccionados no comparten la misma vía."
 
-#: ../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."
@@ -1481,10 +1486,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../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 "Debe seleccionar dos o más nodos para dividir una vía circular."
 
-#: ../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 "
@@ -1494,5 +1499,5 @@
 "nodos de la mitad de la vía)."
 
-#: ../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 "
@@ -1502,5 +1507,5 @@
 "rutas.<br>Debería verificar esto y corregirlo cuando sea necesario.</html>"
 
-#: ../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 "
@@ -1510,5 +1515,5 @@
 "verificar y corregirlo cuando sea necesareo.</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"
@@ -1538,47 +1543,47 @@
 msgstr "Duplicar nodos usados por varias vías."
 
-#: ../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 "Este nodo no está pegado a ninguna otra cosa."
 
-#: ../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 "Ninguno de éstos nodos está pegado a ninguna otra cosa."
 
-#: ../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 "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
-#: ../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 "La selección actual no se puede usar para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecione alguno:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, o"
 
-#: ../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 "* Un nodo que sea usado por más de una vía, o"
 
-#: ../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 "* Un nodo usado por más de una vía y una de esas vías, o"
 
-#: ../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"
 msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o"
 
-#: ../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."
 msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía."
 
-#: ../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"
@@ -1592,9 +1597,9 @@
 "seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nodo despegado"
 
-#: ../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"
@@ -1602,5 +1607,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"
@@ -1641,12 +1646,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Actualizar los objetos de la capa de datos actual desde el servidor."
+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 "Descargar datos"
@@ -1663,5 +1667,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Actualizar selecciones"
 
@@ -1678,5 +1683,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "No hay primitivas seleccionadas para actualizar"
 
@@ -1684,4 +1690,9 @@
 msgid "Selection empty"
 msgstr "Selección vacía"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Actualizar selecciones"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1691,8 +1702,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 ""
-"Subir todos los cambios en la capa de datos actuales a el servidor de OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1830,34 +1839,29 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "''{0}'' geruzarako datuak kargatzen"
+msgstr "Subiendo datos de la capa \"{0}\""
 
 #. we tried to delete an already deleted primitive.
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
-"esta primitiva e intentando  volver a enviar los cambios."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
-"esta primitiva e intentando  volver a enviar los cambios."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Subiendo datos..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1974,9 +1978,9 @@
 msgstr "Datos GPX descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1985,5 +1989,5 @@
 "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
 
-#: ../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 "No se han encontrado datos para este area."
@@ -1999,7 +2003,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "visible (en el servidor)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2015,7 +2018,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Haz click para cancelar y continuar editando el mapa"
+msgstr "Haga clic para cancelar y reanudar la edición"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2040,7 +2042,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2050,5 +2052,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
 msgstr "Errores durante la descarga"
@@ -2064,5 +2065,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
@@ -2095,6 +2096,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 "seleccionado"
@@ -2112,26 +2113,26 @@
 msgstr "Añadir nodo a la vía"
 
-#: ../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 "Conectar la vía existente al nodo"
 
-#: ../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 "Añadir un nodo nuevo a una vía existente"
 
-#: ../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 "Añadir un nodo a la vía y conectar"
 
-#: ../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 "Crear un nodo nuevo."
 
-#: ../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 "Seleccionar el nodo bajo el 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."
@@ -2140,48 +2141,46 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../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 "Comenzar una nueva vía desde el último nodo."
 
-#: ../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 "Continuar la vía desde el último nodo."
 
-#: ../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 "Finalizar dibujo."
 
-#: ../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 "Extruir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Crear áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Extruir vía"
 
-#: ../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 ""
-"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón."
 
-#: ../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 "Soltar el botón del ratón para parar de rotar."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Arrastre el segmento de la vía para hacer un rectángulo."
 
@@ -2242,4 +2241,9 @@
 msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2248,4 +2252,8 @@
 "Soltar el botón del ratón para parar de moverse. Ctrl para unir con en nodo "
 "más cercano."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Soltar el botón del ratón para parar de rotar."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2275,67 +2283,70 @@
 "abajo, derecha; mover el zoom con el botón derecho"
 
-#: ../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 "Buscar ..."
 
-#: ../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 "Búsqueda de objetos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "No se puede buscar porque no hay datos cargados."
-
-#: ../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 "Por favor, introduce una cadena de caracteres como filtro"
 
-#: ../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 "Por favor, introduzca una cadena de búsqueda."
 
-#: ../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 "expresión regular"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../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 "añadir a la selección"
 
-#: ../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 "eliminar de la selección"
 
-#: ../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 "encontrar en la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "distinguir mayúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../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>Calle Mayor</b> - 'Calle' y 'Mayor' en cualquier clave o valor."
 
-#: ../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>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o nombre."
 
-#: ../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:May</b> - 'May' en cualquier parte del nombre."
 
-#: ../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> - clave 'type' con el valor exacto '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>, "
@@ -2345,17 +2356,17 @@
 "b>, <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:May</b> - sin 'May' en el nombre."
 
-#: ../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> - cualquier valor presente en clave=foot"
 
-#: ../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>Búsquedas especiales:</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>)"
@@ -2364,41 +2375,40 @@
 "<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>user:</b>... - todos los objetos modificados por un determinado usuario"
 
-#: ../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 "<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
 
-#: ../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>... - objetos con un determinado número de nodos"
 
-#: ../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>... - objetos con un determinado número de nodos"
-
-#: ../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> - todos los objetos modificados"
 
-#: ../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> - todos los objetos seleccionados"
 
-#: ../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> - todos los objetos incompletos"
 
-#: ../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>untagged</b> - todos los objetos sin etiquetar"
 
-#: ../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"
@@ -2407,5 +2417,5 @@
 "la expresión"
 
-#: ../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"
@@ -2414,5 +2424,5 @@
 "cumplan la expresión"
 
-#: ../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 ""
@@ -2420,14 +2430,14 @@
 "lógico O (disyunción)"
 
-#: ../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 ""
 "Usar <b>\"</b> para delimitar operadores (por ejemplo si la clave contiene :)"
 
-#: ../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 "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
 
-#: ../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
@@ -2437,51 +2447,51 @@
 msgstr "Filtrar"
 
-#: ../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 "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../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 "No se encontraron coincidencias para \"{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 "No se ha añadido nada a la selección al buscar \"{0}\""
 
-#: ../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 "No se ha quitado nada de la selección al buscar \"{0}\""
 
-#: ../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 "No se ha encontrado nada en la selección buscando por ''{0}''"
 
-#: ../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 "Se han encontrado {0} coincidencias"
 
-#: ../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"
@@ -2535,16 +2545,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Número de parámetros incorrecto para el operador de nodos."
+msgstr "Número de parámetros erróneos para las etiquetas de operador"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un "
-"número de nodos o un intervalo, por ejemplo nodos:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2669,6 +2676,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
@@ -2797,5 +2804,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 ""
@@ -2818,9 +2825,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 "parámetro ''{0}'' no debe estar vacío"
+msgstr "El párametro ''{0}'' no debe estar vacío"
 
 #: ../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"
@@ -2856,5 +2866,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 "Dividir segmento de vía"
@@ -2862,6 +2872,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."
@@ -2873,5 +2883,5 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -2882,5 +2892,15 @@
 msgstr "Resolver los conflictos en el estado de borrado en {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"
@@ -2966,5 +2986,5 @@
 msgstr "Resolver {0} conflictos de etiquetado en la relación {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3072,8 +3092,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 "Valor doble ''{0}'' ilegal"
+
+#: ../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 "El valor por defecto es ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3215,9 +3241,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
 msgstr ""
-"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
-"excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3276,5 +3300,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
@@ -3288,5 +3312,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 ""
@@ -3295,4 +3319,43 @@
 "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 "No se encuentran los argumentos de not"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Histórico de la relación {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión "
+"primitiva con la versión inferior {2} no es visible. No se puede hacer "
+"frente a esta incongruencia. Se mantiene mi primitiva. "
 
 #. translators notes must be in front
@@ -3349,33 +3412,34 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advertencia: {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 "Se esperaba un ID >=0. Obtenido {0}"
 
-#: ../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 "una proimitiva con id=0 no puede ser invisible"
 
-#: ../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 "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../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 "Se esperaba una versión > 0. Encontrada {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3399,47 +3463,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 "No se puede añadir nodo {0} a la vía incompleta {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "No existe una primitiva con la versión {0} en este historial"
-
-#: ../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 "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
-
-#: ../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 "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "ninguna versión más antigua encontrada. El histórico está vacío."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "no se encontró ninguna versión más reciente. El histórico está vacío."
-
-#: ../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 "No se encontró ninguna primitiva con ID {0} en este conjunto de datos"
-
-#: ../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 ""
-"No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto "
-"de datos"
-
-#: ../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
@@ -3450,6 +3495,7 @@
 msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
@@ -3462,148 +3508,145 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../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 "Vía de tipo área sin cerrar"
 
-#: ../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 "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../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 "Miembro ''{0}'' borrado en la relación."
 
-#: ../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 "Vía ''{0}''  con menos de dos puntos."
 
-#: ../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 "Se ha encontrado más de una vía \"desde\"."
 
-#: ../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 "Se ha encontrado más de una vía \"a\"."
 
-#: ../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 "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../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 "Función ''{0}'' desconocida."
 
-#: ../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 "Tipo de miembro \"{0}\" desconocido."
 
-#: ../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 "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../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 "No se ha encontrado ninguna vía \"a\"."
 
-#: ../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 "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../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 "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../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 "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../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 "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../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 "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../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 "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../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 "Intersección entre las vías ''{0}'' y ''{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 "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../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 "La función \"{0}\" no es útil para el tramo \"{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 "La no-vía ''{0}'' en multipolígono"
 
-#: ../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 "Ninguna vía exterior en el multipolígono ''{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 "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../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 "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../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 "sin etiquetar"
 
-#: ../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 "texto"
 
-#: ../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 ""
-"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión "
-"primitiva con la versión inferior {2} no es visible. No se puede hacer "
-"frente a esta incongruencia. Se mantiene mi primitiva. "
-
-#: ../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 "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advertencia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../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
@@ -3613,5 +3656,5 @@
 msgstr[1] "nodos"
 
-#: ../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
@@ -3621,6 +3664,6 @@
 msgstr[1] "vías"
 
-#: ../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
@@ -3630,13 +3673,13 @@
 msgstr[1] "relaciones"
 
-#: ../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 "vía sin etiquetar"
 
-#: ../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 "vía incompleta"
 
-#: ../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
@@ -3644,5 +3687,5 @@
 msgstr "fondo"
 
-#: ../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 "resaltar"
@@ -3728,5 +3771,5 @@
 msgstr "No mostrar de nuevo"
 
-#: ../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
@@ -3734,32 +3777,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 "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "vía"
 
-#: ../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 "ferrocarril"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vía fluvial"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "uso del suelo"
 
-#: ../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"
@@ -3768,5 +3811,5 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3775,33 +3818,33 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Excepción de seguridad"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Excepción de red"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "Excepción IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: ../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
@@ -3809,9 +3852,9 @@
 msgstr "Conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Objeto borrado"
@@ -3833,7 +3876,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Cerrar el diálogo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4035,5 +4077,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 "Editar"
@@ -4159,10 +4201,10 @@
 msgstr "Usuario:"
 
-#: ../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 "capa no listada"
 
-#: ../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"
@@ -4170,7 +4212,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "No, calcelar la operación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4294,5 +4335,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"
@@ -4301,5 +4342,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"
@@ -4309,5 +4350,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 "Miembros"
@@ -4780,5 +4821,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 "No, abortar"
@@ -4838,6 +4879,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 "<indefinido>"
@@ -4944,7 +4983,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -4970,4 +5009,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"
@@ -5064,5 +5104,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"
@@ -5073,5 +5113,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"
@@ -5090,12 +5130,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Mantaner lo mío"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5114,12 +5152,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Fijar una función para los miembros seleccionados"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Etiquetas de relaciones"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5135,7 +5171,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Datu kargak <strong>huts egin du</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5202,5 +5237,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
@@ -5297,5 +5332,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"
@@ -5351,11 +5386,11 @@
 msgstr "Mostrar el historial de todos los elementos seleccionados"
 
-#: ../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
@@ -5363,14 +5398,14 @@
 msgstr "Recargar"
 
-#: ../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 ""
 "Recarge todos los objetos actualmente seleccionados y refresque la lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../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 ""
@@ -5427,7 +5462,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] "Esto cambiará {0} objeto."
@@ -5435,5 +5469,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 "Un valor vacío elimina la clave."
 
@@ -5458,4 +5493,11 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
+#: ../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] "Esto cambiará {0} objeto."
+msgstr[1] "Esto cambiará {0} objetos."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5533,60 +5575,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 "Relaciones"
 
-#: ../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 "Abrir una lista de todas las relaciones."
 
-#: ../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 "Relaciones: {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 "Abrir un editor para la relación seleccionada"
 
-#: ../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 "Borrar la relación seleccionada"
 
-#: ../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 "Crear un anueva relación"
 
-#: ../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 "Crea una copia de esta relación y la abre en otra ventana de edición."
 
-#: ../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 "Borrar la relación seleccionada"
-
-#: ../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 "Selecione alguno:"
-
-#: ../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 "Descargar las relaciones selecionadas"
-
-#: ../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 "Descargar miembros"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5745,5 +5783,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}"
@@ -5982,18 +6020,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 "Ampliar a"
 
-#: ../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 ""
@@ -6016,5 +6054,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}"
@@ -6085,7 +6123,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Actualmente no hay un conjunto cambios abierto."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6097,12 +6134,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Crear frontera"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Mover los miembros seleccionados hacia abajo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6113,7 +6148,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 "Por favor, introduzca un nombre para la localización."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6123,12 +6157,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Mover los miembro(s) seleccionos hacia arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Mover los miembro(s) seleccionos hacia arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6187,7 +6219,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Separar vía por el nodo seleccionado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6196,7 +6227,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "La vía seleccionada no contiene el nodo seleccionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6220,7 +6250,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "No se seleccionó ninguna relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6237,17 +6266,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Mover los miembro(s) seleccionos hacia arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Por favor, seleccione la fila a editar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6263,11 +6289,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Introduzca un lugar para buscar:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Áreas en torno a lugares"
 
 #. SAXException does not chain correctly
@@ -6277,12 +6302,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Buscar ..."
+msgstr "Buscar..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Dirección para buscar por la tierra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7212,7 +7235,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "próximo a"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7257,5 +7279,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 ""
@@ -7269,5 +7291,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 ""
@@ -7278,5 +7300,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 ""
@@ -7285,19 +7307,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 ""
@@ -7307,32 +7329,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 ""
@@ -7354,37 +7376,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 "Histórico del nodo {0}"
 
-#: ../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 "Histórico de la vía {0}"
 
-#: ../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 "Histórico de la relación {0}"
 
-#: ../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 "Cerrar el diálogo"
 
-#: ../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 ""
@@ -7392,5 +7414,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 ""
@@ -7398,9 +7420,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 ""
@@ -7409,24 +7431,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 "Cargar historial"
 
-#: ../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 "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
+
+#: ../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}"
@@ -7439,4 +7471,22 @@
 msgstr "Nodo {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoom al problema"
+
+#: ../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 "Cargar historial"
+
+#: ../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
@@ -7449,17 +7499,69 @@
 msgstr "Relación {0}"
 
-#: ../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 "Ordenar menú de preajustes"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Usuario"
 
-#: ../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 "desconocido"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
+"las suyas</html>"
+
+#: ../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 "<anónimo>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7484,4 +7586,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Versión {0} creada en {1} por {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "borrado"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Versión {0} creada en {1} por {2}"
 
@@ -7828,9 +7945,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] "{0} objeto para modificar:"
-msgstr[1] "{0} objetos para modificar:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7913,13 +8030,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
@@ -7988,5 +8105,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}..."
@@ -7999,5 +8116,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 "Imagenes Geoetiquetadas"
@@ -8023,5 +8140,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"
@@ -8076,43 +8193,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 "punto GPS"
 
 #: ../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 "Personalice el dibujo de línea"
 
 #: ../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 "Usar las preferencias globales"
 
 #: ../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 "Dibujar las líneas entre puntos en esta capa"
 
 #: ../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 "No dibujar las líneas entre puntos en esta capa"
 
 #: ../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 "Seleccione las opciones de dibujo de línea"
 
 #: ../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 "Personalizar colores"
 
 #: ../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"
@@ -8120,6 +8237,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"
@@ -8209,10 +8326,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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."
@@ -8222,43 +8339,43 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../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 (EN)"
 
-#: ../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 "Convertido desde: {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 "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../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 "Descargar todo entre:"
 
-#: ../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} metros"
 
-#: ../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 "Área máxima por petición:"
 
-#: ../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 ""
@@ -8269,9 +8386,9 @@
 "<br¿Desea continuar?</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 "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../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 "
@@ -8282,5 +8399,5 @@
 "comienzo."
 
-#: ../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 "
@@ -8339,37 +8456,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
-
-#: ../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} borrados.)"
-msgstr[1] " ({0} borrados.)"
-
-#: ../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} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../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 "Versión del API: {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 "Convertir a capa de gpx"
 
-#: ../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."
@@ -8377,5 +8493,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"
@@ -8384,5 +8500,5 @@
 msgstr[1] "trazas"
 
-#: ../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"
@@ -8390,5 +8506,5 @@
 msgstr[1] "puntos"
 
-#: ../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"
@@ -8397,5 +8513,5 @@
 msgstr[1] "una traza con {0} puntos"
 
-#: ../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"
@@ -8404,5 +8520,5 @@
 msgstr[1] "{0} formado por las trazas {1}"
 
-#: ../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"
@@ -8411,9 +8527,9 @@
 msgstr[1] "{0} puntos"
 
-#: ../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 "Marcador gps"
 
-#: ../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"
@@ -8421,5 +8537,5 @@
 msgstr[1] "marcadores"
 
-#: ../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"
@@ -8428,9 +8544,9 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../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 "Sincronizar audio"
 
-#: ../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."
@@ -8438,5 +8554,5 @@
 "Necesita pausar el audio en el momento que oiga su entrada de sincronización"
 
-#: ../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
@@ -8444,14 +8560,14 @@
 msgstr "Audio sincronizado en el punto {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 "No se puede sincronizar en la capa que se escuchaba."
 
-#: ../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 "Crear un marcador de audio en la cabecera de escucha"
 
-#: ../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 "
@@ -8461,13 +8577,13 @@
 "marcador."
 
-#: ../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 "No existen marcadores de audio en esta capa desde los que desplazar."
 
-#: ../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 "Mostrar/Esconder Texto/Iconos"
 
-#: ../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 ""
@@ -8539,5 +8655,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 "Por favor, seleccione la fila a editar"
@@ -8551,5 +8667,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."
@@ -9259,12 +9375,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Activar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Estilos disponibles (desde {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9302,53 +9417,44 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
 msgstr ""
-"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Editar el valor de la clave seleccionada para todos los objetos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
 msgstr ""
-"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+"Añadir los estilos seleccionados disponibles a la lista de estilos activos"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Recarga la lista de estilos disponibles desde ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Añadir una nueva etiqueta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Refrescar la lista de selección."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Editar la fuente seleccionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "''{0}'' geruzarako datuak kargatzen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Error al subir o descargar datos de<br>''{0}''<br>debido a un problema "
-"con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
@@ -9982,5 +10088,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}''."
@@ -10007,5 +10113,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}."
@@ -10013,5 +10119,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}"
@@ -10024,5 +10130,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}''."
@@ -10183,5 +10289,5 @@
 msgstr "El archivo \"{0} no existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10190,38 +10296,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 "Valor ilegal del atributo \"ref\" del elemento <nd>. Es  {0}."
 
-#: ../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 ""
@@ -10229,19 +10335,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 "Especificación <miembro> incompleta sin 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 "Objeto con id=0 ilegal"
 
-#: ../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 ""
@@ -10252,9 +10358,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 ""
@@ -10264,25 +10370,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 "Versión del API desconocida o no soportada. Es {0}."
 
-#: ../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 ""
@@ -10290,5 +10396,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10297,5 +10403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10303,5 +10409,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10310,13 +10416,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 "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
@@ -10329,5 +10435,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Descargando desde el servidor OSM"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -10470,14 +10576,13 @@
 
 #: ../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] "Complemento {0} descargado correctamente. Por favor, reinicie JOSM."
-msgstr[1] ""
-"Complementos {0} descargados correctamente. Por favor, reinicie JOSM."
+msgstr[0] "{0} componente actualizado correctamente."
+msgstr[1] "{0} componentes actualizados correctamente."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Por favor, reinicia JOSM"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -10527,4 +10632,7 @@
 "Update plugins now?"
 msgstr ""
+"Acabas de actualizar tu JOSM.\n"
+"Para evitar problemas los componentes deben actualizarse también.\n"
+"¿Deseas actualizar los componentes ahora?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
@@ -10535,5 +10643,4 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
 msgstr "Actualizar complementos"
@@ -10541,5 +10648,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Skip update"
-msgstr ""
+msgstr "Omitir actualización"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
@@ -10685,35 +10792,4 @@
 "{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 "desconocido"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -11065,5 +11141,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Privado (únicamente compartir como anónimo, desordenar puntos)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
@@ -11371,47 +11447,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 "Extrayendo localizaciones GPS del EXIF"
 
-#: ../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 "Iniciando escaneo del directorio"
 
-#: ../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 "¡¡Uno de los archivos seleccionados era nulo!!"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
+msgstr "Uno de los archivos seleccionados era nulo"
+
+#: ../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 "Leyendo fotos..."
 
-#: ../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 "Imposible obtener ruta apropiada para el directorio {0}\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 "Escaneando directorio {0}"
 
-#: ../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 "Encontrado archivo nulo en el directorio {0}\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 "Error mientras se obtenían archivos del directorio {0}\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 "Correlacionar con GPX"
 
-#: ../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."
@@ -11427,24 +11502,24 @@
 msgstr "Cargar el conjunto de imágenes como una nueva capa."
 
-#: ../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 "Archivos GPX (*.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 "El archivo {0} ya está cargado con el nombre \"{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 "Error mientras se analizaba sintácticamente {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 "No se pudo leer \"{0}\""
 
-#: ../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."
@@ -11456,34 +11531,34 @@
 "lee en la foto y seleccione una zona horaria<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 "Hora de la foto (desde 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 "Hora del Gps (leída desde la foto tomada): "
 
-#: ../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/aaaa 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 "Yo estoy en la zona horaria de: "
 
-#: ../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 "Sin fecha"
 
-#: ../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 "Abrir otra 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 "sincronizar el tiempo de una foto con el receptor GPS"
 
-#: ../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"
@@ -11493,29 +11568,29 @@
 "Por favor, utilice el formato requerido."
 
-#: ../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 "Fecha no válida"
 
-#: ../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 "<La traza GPX no está cargada aún>"
 
-#: ../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 "Traza GPX: "
 
-#: ../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 "Abrir otra traza gpx"
 
-#: ../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 "Zona horaria: "
 
-#: ../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 "Ajuste:"
 
-#: ../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 ""
@@ -11523,41 +11598,41 @@
 "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 "Actualizar posición para: "
 
-#: ../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 "Todas las imágenes"
 
-#: ../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 "Imágenes sin la posición exif"
 
-#: ../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 "Fotos no etiquetadas todavía"
 
-#: ../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 "Correlacionar las imágenes con la traza GPX"
 
-#: ../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 "Correlación"
 
-#: ../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 "Estimación automática"
 
-#: ../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 "Debe seleccionar una traza GPX"
 
-#: ../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 "No se ha seleccionado una traza GPX"
 
-#: ../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 ""
@@ -11568,9 +11643,9 @@
 "Formato esperado: {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 "Zona horaria no válida"
 
-#: ../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 ""
@@ -11581,18 +11656,18 @@
 "Formato esperado: {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 "Desplazamiento inválido"
 
-#: ../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 "Encontrado {0} coincidencias de{1} en la traza GPX {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 "Traza GPX cargada"
 
-#: ../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 ""
@@ -11600,9 +11675,9 @@
 "fueron tomadas."
 
-#: ../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 "Las fotografías no contiene información horaria"
 
-#: ../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."
@@ -11611,39 +11686,39 @@
 "seleccione otra."
 
-#: ../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 "La traza GPX no posee información horaria"
 
-#: ../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 "Zona horaria: {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 "Minutos: {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 "Segundos: {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 "Ajustadas al track GPS {0} de {1} fotografías"
 
-#: ../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 "(Diferencia horaria de {0} días)"
 
-#: ../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 "Diferencia temporal entre la traza y las fotografías: {0}m {1}s"
 
-#: ../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 "
@@ -11654,13 +11729,13 @@
 "manual."
 
-#: ../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 "Ajuste de fotografías a traza fallido"
 
-#: ../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 "Ajustar zona horaria y la diferencia temporal"
 
-#: ../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 "Valores por defecto"
@@ -11681,5 +11756,5 @@
 msgstr "Error en archivo {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11692,37 +11767,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 "Error al leer el archivo"
 
-#: ../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 "Archivo caché de la zona Lambert 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 "Archivo caché de la zona Lambert 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 "Archivo caché de la zona Lambert 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 "Archivo caché de la zona Lambert 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: URL Ilegal."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11734,18 +11809,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 "Seleccionar comuna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Elegir desde..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
@@ -11772,5 +11847,5 @@
 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 ""
@@ -11778,30 +11853,30 @@
 "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 "Invertir escala de grises (para fondos de pantalla negros)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Fijar fondo de pantalla transparante"
 
-#: ../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 "Dibujar límites de los datos descargados."
 
-#: ../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 "Activar caché automático"
 
-#: ../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 "Tamaño máximo de caché (en 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."
@@ -11819,9 +11894,9 @@
 "creado mediante este componente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS del catastro francés"
 
-#: ../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 ""
@@ -11829,10 +11904,10 @@
 "activo</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Fuente"
 
-#: ../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 "
@@ -11842,5 +11917,5 @@
 "preferencias de JOSM."
 
-#: ../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). "
@@ -11850,9 +11925,9 @@
 "intermedios. Útil para los textos sobre fondos oscuros."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Permitir múltiples capas apiladas"
 
-#: ../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 ""
@@ -11860,5 +11935,5 @@
 "transparente."
 
-#: ../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 ""
@@ -11866,32 +11941,32 @@
 
 #. 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 ""
 "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)"
 
-#: ../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 "Fijar tamaño del cuadrado (por defecto 100 m)"
 
-#: ../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 "Tamaño fijado (desde 25 a 100 m)"
 
-#: ../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 ""
@@ -11899,31 +11974,31 @@
 "tamaño"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Etiquetado automático de la fuente añadida:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?"
 
-#: ../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 "Descargando {0}"
 
-#: ../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 "Contactando con servidor WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Crear edificios"
 
-#: ../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"
@@ -11933,31 +12008,31 @@
 "la importación de archivo está limitada a 1km2 como máximo."
 
-#: ../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 ""
 "Por favor, active el autoabastecimiento y compruebe el catastro Millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "Extraer SVG de la caja de vista..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Extaer el mejor ajuste de frontera..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Crear frontera"
 
-#: ../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"
@@ -11965,29 +12040,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 "Extraer los límites de la comuna"
 
-#: ../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 "Únicamente sobre capas vectorizadas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Estraer las huellas de los edificios"
 
-#: ../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 "Descargando imágenes desde el servidor francés WMS del Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Catastro: {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"
@@ -11996,13 +12071,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"
@@ -12010,5 +12085,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"
@@ -12016,14 +12091,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"
@@ -12031,14 +12106,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"
@@ -12046,64 +12121,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 "Este"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Norte"
 
-#: ../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 "Zona"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Zona Lambert"
 
-#: ../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 "Cargar localizaciones desde cache (solo si la cache está activada)"
 
-#: ../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 "Cambiar localización"
 
-#: ../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 "Establecer una nueva localización para la nueva solicitud"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Añadir una nueva capa"
 
-#: ../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 "Localización"
 
-#: ../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 "
@@ -12113,25 +12188,25 @@
 "puntuación conocida por 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 "Añadir nueva capa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Reinicializar cookie"
 
-#: ../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 "Obtener nueva cookie (sesión caducada)"
 
-#: ../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 "Exportar como formato PNG (solo imágenes raster)"
 
-#: ../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
@@ -12141,14 +12216,14 @@
 msgstr[1] "Vía simplificada (eliminados {0} nodos)"
 
-#: ../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 "Ajustar WMS"
 
-#: ../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 "Ajustar la posición de la capa WMS (sólo imágenes raster)"
 
-#: ../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"
@@ -12156,5 +12231,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
@@ -12162,5 +12237,5 @@
 msgstr "Descargar tesela WMS desde {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"
@@ -12170,34 +12245,34 @@
 "Seleccione primero una de ellas y reinténtelo"
 
-#: ../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 "Capa vacía"
 
-#: ../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 "Capa WMS ({0}), {1} tesela(s) cargada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../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 "Tamaño de la imagen raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../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 "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12208,18 +12283,18 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../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 "Error en la zona Lambert  de la caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12329,9 +12404,9 @@
 msgstr "Crear un duplicado de la vía"
 
-#: ../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 "Capa para la edición de trazas GPX"
 
-#: ../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 "Convertir a capa GPX con tiempo anonimizado"
@@ -12348,11 +12423,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 "Importar camino de capa gpx"
 
 #: ../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 "Soltar camino existente"
@@ -12362,5 +12437,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 "No se encontró la capa de datos GPX"
@@ -12573,5 +12648,5 @@
 msgstr "Mostrar fotos sin geoetiquetar"
 
-#: ../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 "Imágenes importadas"
@@ -13007,5 +13082,5 @@
 msgstr "Ángulo entre dos nodos seleccionados"
 
-#: ../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 "Capa para mediciones"
@@ -13029,17 +13104,19 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
 msgid "Please select 4 or 5 ways to assign no left turns."
 msgstr ""
+"Por favor, seleccione 4 o 5 vías para asignar giros prohibidos a la "
+"izquierda."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
 msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Por favor, seleccione 4 vías que conformen una relación cerrada"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
 msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Imposible ordenar las vías. Por favor, verifica sus direcciones"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
@@ -13058,21 +13135,22 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
-msgstr ""
+msgstr "Crear multipolígono"
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
-msgstr ""
+msgstr "Crear multipolígono."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
+"Una de las vías seleccionadas es en realidad parte de otro multipolígono."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
+msgstr "El multipolígono debe consistir únicamente de vías cerradas."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Debes seleccionar al menos dos vías"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13084,5 +13162,5 @@
 msgstr "Bucle de descarga de 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 "Mostar cuestiones de OpenStreetBug"
@@ -13228,7 +13306,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Capa"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13396,43 +13473,41 @@
 msgstr "Introduzca el peso de los valores"
 
-#: ../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 "Mapa desplazable"
 
-#: ../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 "Zoom automático: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
+msgstr "Auto Zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../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 "Mostrar info"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+msgstr "Mostrar información de la tesela"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../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 "Incrementar zoom"
 
-#: ../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 "Reducir zoom"
 
-#: ../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
+msgstr "Ajustar al tamaño de la tesela"
+
+#: ../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
+msgstr "Alinear caché de teselas"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663
 msgid "image "
 msgstr "imagen "
@@ -13468,7 +13543,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max. nivel de zoom: "
+msgstr "Nivel mínimo de zoom: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13829,6 +13903,6 @@
 msgstr "¿Está usted seguro?"
 
-#: ../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
@@ -13836,5 +13910,5 @@
 msgstr "Validación de errores"
 
-#: ../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 "Sin validación de errores"
@@ -13927,5 +14001,5 @@
 msgstr "otra validación"
 
-#: ../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}"
@@ -14025,7 +14099,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Línea de costa desordenada"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -14057,18 +14130,18 @@
 msgstr "Cruce de vías"
 
-#: ../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 "Nodos duplicados"
 
-#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar."
 
-#: ../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 "Nodos en la misma posición"
 
-#: ../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 "Confirmación"
@@ -14233,61 +14306,61 @@
 #. 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 "Problema al dibujar"
 
-#: ../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 "Clave ''{0}'' no válida."
 
-#: ../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 "Etiquetas con valores vacíos"
 
-#: ../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 "Clave de propiedad no válida"
 
-#: ../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 "Espacio en blanco no válido en la clave de propiedad"
 
-#: ../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 ""
 "Los valores de la propiedad empiezan y terminan con un espacio en blanco"
 
-#: ../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 "Los valores de propiedad contienen entidad de HTML"
 
-#: ../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 "La clave ''{0}\" no existe en los predefinidos"
 
-#: ../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 "Esta clave no está predefinida"
 
-#: ../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 "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos."
 
-#: ../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 "Los predefinidos no contiene valores apropiados"
 
-#: ../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 "FIXMES"
 
-#: ../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 "Comprobar las propiedades de las claves"
 
-#: ../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 ""
@@ -14295,21 +14368,21 @@
 "comprobación de las palabras."
 
-#: ../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 "Usar analizador de propiedad compleja."
 
-#: ../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 "Validar valores de propiedad y etiquetas que usan reglas complejas"
 
-#: ../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 "Fuente de test de etiquetas"
 
-#: ../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."
@@ -14320,25 +14393,25 @@
 "del corrector de etiquetas."
 
-#: ../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 "Agregar nueva fuente a la lista."
 
-#: ../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 "Editar la fuente seleccionada."
 
-#: ../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 "Borrar la fuente seleccionada de la lista."
 
-#: ../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 "Fuentes de datos"
 
-#: ../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 "Analizar propiedades de los valores."
 
-#: ../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 ""
@@ -14346,62 +14419,62 @@
 "los predefinidos."
 
-#: ../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 "Comprobar FIXMES"
 
-#: ../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 "Buscar nodos o viales con FIXME en cualquier propiedad de valor"
 
-#: ../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 "Compruebar el registro de notas."
 
-#: ../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 "Analizar si el mapa creado contiene errores en los datos."
 
-#: ../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 "Usar datos de archivo por defecto."
 
-#: ../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 "Usar datos de archivo por defecto (recomendado)."
 
-#: ../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 "Ignorar el uso de etiquetas de archivos por defecto."
 
-#: ../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 "Utilizar  etiquetas de archivos por defecto (recomendado)."
 
-#: ../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 "Utilizar el corrector ortográfico por defecto."
 
-#: ../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 "Utilizar el corrector ortográfico por defecto (recomendado)."
 
-#: ../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 "Fijar las propiedades"
 
-#: ../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 "No se pudo encontrar el tipo de elemento"
 
-#: ../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 "No se pudo encontrar el nivel de alerta"
 
-#: ../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 "Expresión ilegal ''{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}''"
@@ -14578,17 +14651,17 @@
 "vía."
 
-#: ../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 "Nodo de extremo de vía próxima a otra carretera"
 
-#: ../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 "Nodo de extremo de vía próximo a otro vial"
 
-#: ../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 "Nodo de vía próximo a otro vial"
 
-#: ../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 "Conectado nodo de extremo de vía próximo a otro vial"
@@ -14641,15 +14714,15 @@
 "Este test comprueba la dirección de vías fluviales, terrestres y de costa."
 
-#: ../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 ""
 "Línea de costa invertida: la tierra no puede situarse al lado izquierdo"
 
-#: ../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 ""
 "Línea de ribera invertida: la tierra no puede situarse al lado izquierdo"
 
-#: ../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 ""
@@ -14690,70 +14763,74 @@
 
 #: ../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 "Capa WMS ({0}), descargando en zoom {1}"
+msgstr "Capa Papers layer ({0}) en zoom {1}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-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 "Seleccione un nodo de inicio en el extremo de la vía"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Extender al final de la línea"
-
-#. 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"
-msgstr "Alcanzar una intersección"
+msgstr "Walking Papers"
+
+#: ../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 "Descargar"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Descargar datos del mapa del servidor OSM."
+
+#: ../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>No hay capas de capa fuente <br>\"{0}\"<br>podría ser unida a.</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 "Eliminando nodos duplicados..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Ocurrió una excepción"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "ayuda"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Ayuda / Acerca de..."
-
-#: ../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 "Ayuda del componente WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14860,9 +14937,9 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Descarga automática"
 
-#: ../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}''"
@@ -14871,19 +14948,19 @@
 "''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr "(desactivado)"
 
-#: ../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 "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../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 "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14898,13 +14975,13 @@
 "descargar las teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../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"
@@ -14913,42 +14990,42 @@
 "o cambe la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../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 "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
@@ -15208,4 +15285,6 @@
 "relation editor."
 msgstr ""
+"Crea multipolígonos mediante un solo clic, mucho más fácil que la forma "
+"estándar con el editor de relaciones."
 
 #. Plugin nearclick
@@ -19439,14 +19518,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Lugar arqueológico"
+msgstr "Sitio Paleontológico"
 
 #. 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 "Editar lugar arqueológico"
+msgstr "Editar Sitio Paleontológico"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -21725,5 +21802,5 @@
 #: build/trans_presets.java:2476
 msgid "gray"
-msgstr ""
+msgstr "gris"
 
 #: build/trans_presets.java:2476
@@ -26766,5 +26843,5 @@
 #: build/trans_style.java:3383
 msgid "woodarea"
-msgstr ""
+msgstr "área forestal"
 
 #. color water
@@ -27415,77 +27492,141 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czech CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
-
-#~ msgid "File could not be found."
-#~ msgstr "El archivo no se encuentra."
+msgstr "Czech UHUL:ORTOFOTO"
+
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "No se puede buscar porque no hay datos cargados."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "No existe una primitiva con la versión {0} en este historial"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "ninguna versión más antigua encontrada. El histórico está vacío."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr ""
+#~ "no se encontró ninguna versión más reciente. El histórico está vacío."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr ""
+#~ "No se encontró ninguna primitiva con ID {0} en este conjunto de datos"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este "
+#~ "conjunto de datos"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Seleccione un nodo de inicio en el extremo de la vía"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Extender al final de la línea"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Alcanzar una intersección"
+
+#~ msgid "help"
+#~ msgstr "ayuda"
+
+#~ msgid "Help / About"
+#~ msgstr "Ayuda / Acerca de..."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Ayuda del componente WMS"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "No data imported."
+#~ msgstr "No se importó ningún dato."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de archivo desconocida."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ningún documento abierto luego nada por grabar."
+
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Combinar conflictos"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolver conflictos"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Existieron conflictos durante la importación"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contactando con el servidor OSM..."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Error mientras se analizaba sintácticamente"
+
+#~ msgid "their version:"
+#~ msgstr "su versión:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versión resuelta:"
+
+#~ msgid "my version:"
+#~ msgstr "mi versión:"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
+
+#~ msgid "Unknown version"
+#~ msgstr "Versión desconocida"
+
+#~ msgid "position"
+#~ msgstr "posición"
+
+#~ msgid "different"
+#~ msgstr "diferente"
+
+#~ msgid "false"
+#~ msgstr "falso"
+
+#~ msgid "true"
+#~ msgstr "verdadero"
+
+#~ msgid "unnamed"
+#~ msgstr "sin nombre"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Cambios no guardados"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nombre de usuario OSM (correo electrónico)"
 
 #~ msgid "Please select at least one task to download"
 #~ msgstr "Por favor, seleccione al menos una tarea para descargar"
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Subida a la API de OSM fallida"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relación con conclicto"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
-#~ "función {2}.<br>¿Eliminar de la relación?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\"."
-#~ "<br>¿Eliminar de la relación?</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Error mientras se analizaba sintácticamente"
-
-#~ msgid "File not found"
-#~ msgstr "Archivo no encontrado."
-
-#~ msgid "Replace"
-#~ msgstr "Reemplazar"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Por favor, introduzca las coordenadas deseadas primero."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Seleccione un marcador primero."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Please, introduzca la cadena de caracteres que desea buscar"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
-
-#~ msgid "name"
-#~ msgstr "nombre"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copiar predeterminados"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Por favor, seleccione una fila para copiar"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr ""
-#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
-#~ "{0}."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Error mientras se cargaba la página {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Abrir en el navegador"
 
 #~ msgid ""
@@ -27496,104 +27637,4 @@
 #~ "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
 
-#~ msgid "Show Tile Status"
-#~ msgstr "Mostrar estado de la tesela"
-
-#~ msgid "Request Update"
-#~ msgstr "Solicitar actualización"
-
-#~ msgid "error loading metadata"
-#~ msgstr "error al cargar los metadatos"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "solicitado:{0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "errore al solicitar actualización"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "No data imported."
-#~ msgstr "No se importó ningún dato."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de archivo desconocida."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ningún documento abierto luego nada por grabar."
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Combinar conflictos"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver conflictos"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existieron conflictos durante la importación"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contactando con el servidor OSM..."
-
-#~ msgid "their version:"
-#~ msgstr "su versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión resuelta:"
-
-#~ msgid "my version:"
-#~ msgstr "mi versión:"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
-
-#~ msgid "Unknown version"
-#~ msgstr "Versión desconocida"
-
-#~ msgid "position"
-#~ msgstr "posición"
-
-#~ msgid "different"
-#~ msgstr "diferente"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "true"
-#~ msgstr "verdadero"
-
-#~ msgid "unnamed"
-#~ msgstr "sin nombre"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Cambios no guardados"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
-
-#~ msgid "Change"
-#~ msgstr "Modificar"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nombre de usuario OSM (correo electrónico)"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error mientras se cargaba la página {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Abrir en el navegador"
-
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "El complemento requiere actualizar JOSM: {0}."
@@ -27610,4 +27651,10 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> no tiene ref"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, introduzca las coordenadas deseadas primero."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Seleccione un marcador primero."
 
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
@@ -27640,4 +27687,7 @@
 #~ msgstr "Borrar {1} {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Relación con conclicto"
+
 #~ msgid "hikingmap"
 #~ msgstr "topoguía"
@@ -27696,4 +27746,7 @@
 #~ "versión escogida de la lista del historial"
 
+#~ msgid "name"
+#~ msgstr "nombre"
+
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Añadir site-josm.xml o bien Páginas Wiki"
@@ -27716,4 +27769,7 @@
 #~ msgid "Rotate"
 #~ msgstr "Rotar"
+
+#~ msgid "File not found"
+#~ msgstr "Archivo no encontrado."
 
 #~ msgid "All the ways were empty"
@@ -27788,4 +27844,16 @@
 #~ msgstr "Copiar por defecto"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Por favor, seleccione una fila para copiar"
+
+#~ msgid "Request Update"
+#~ msgstr "Solicitar actualización"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostrar estado de la tesela"
+
+#~ msgid "error loading metadata"
+#~ msgstr "error al cargar los metadatos"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?"
@@ -27796,4 +27864,10 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Importar archivo TCX"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Please, introduzca la cadena de caracteres que desea buscar"
 
 #~ msgid ""
@@ -27806,4 +27880,10 @@
 #~ msgid "Validate"
 #~ msgstr "Validar"
+
+#~ msgid "requested: {0}"
+#~ msgstr "solicitado:{0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "errore al solicitar actualización"
 
 #~ msgid "Found <member> element in non-relation."
@@ -27833,4 +27913,7 @@
 #~ msgid "Portcullis"
 #~ msgstr "Rastrillo"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
 
 #~ msgid "Metacarta Map Rectifier image id"
@@ -28280,4 +28363,7 @@
 #~ msgstr "el parámetro '{0}' no debe ser nulo"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Subida a la API de OSM fallida"
+
 #~ msgid "Data Layer"
 #~ msgstr "Capa de datos"
@@ -28297,4 +28383,7 @@
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar predeterminados"
 
 #~ msgid "removing reference from way {0}"
@@ -28320,4 +28409,7 @@
 #~ msgid "Conflict created"
 #~ msgstr "Conflicto creado"
+
+#~ msgid "File could not be found."
+#~ msgstr "El archivo no se encuentra."
 
 #~ msgid ""
@@ -28403,7 +28495,35 @@
 #~ "obtenido \"{1}\""
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\"."
+#~ "<br>¿Eliminar de la relación?</html>"
+
 #~ msgid "Processing {0}"
 #~ msgstr "Procesando {0}"
 
+#~ msgid "Replace"
+#~ msgstr "Reemplazar"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
+#~ "función {2}.<br>¿Eliminar de la relación?</html>"
+
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relación: desde {0} a {1} a través de {2}"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr ""
+#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
+#~ "{0}."
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 18508)
+++ applications/editors/josm/i18n/po/et.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 14:06+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:37+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: Estonian <et@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 "Viga"
@@ -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"
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -455,5 +456,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
@@ -495,5 +496,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
@@ -502,6 +503,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"
@@ -685,5 +687,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
@@ -696,5 +698,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"
@@ -766,5 +768,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
@@ -772,28 +782,28 @@
 msgstr ""
 
-#: ../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 "Impordi ajal leidis aset {0} konflikti."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konfliktid allalaadimisel"
 
-#: ../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}"
@@ -830,10 +840,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 "Ekspordi GPX-i..."
 
 #: ../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 "Ekspordi andmed GPX faili."
@@ -846,11 +856,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
@@ -881,5 +890,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
@@ -894,17 +902,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
@@ -964,5 +973,5 @@
 msgstr "Ühenda sõlm lähima teega."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Ühenda sõlm ja joon."
@@ -993,20 +1002,19 @@
 msgstr "Palun vali vähemalt kaks sõlme mida liita."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Katkestan..."
-
-#: ../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 "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1147,7 +1155,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Andmete allalaadimine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1294,10 +1301,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 "Salvesta"
 
 #: ../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 "Salvesta praegused andmed"
@@ -1354,10 +1361,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 "Salvesta nimega..."
 
 #: ../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 "Salvesta need andmed uude faili."
@@ -1398,25 +1405,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 "Sulge"
 
-#: ../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 "Lahuta tee."
 
-#: ../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 "Lahuta tee valitud sõlme kohalt."
 
-#: ../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 "Valik ei ole lahutamiseks sobiv."
 
-#: ../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."
@@ -1424,5 +1431,5 @@
 msgstr[1] "Valitud sõlmed ei ole tee keskel."
 
-#: ../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 "
@@ -1438,9 +1445,9 @@
 "sõlmed kuuluvad"
 
-#: ../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 "Valitud sõlmed ei ole samast teest."
 
-#: ../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."
@@ -1448,10 +1455,10 @@
 msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
 
-#: ../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 "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada"
 
-#: ../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 "
@@ -1461,5 +1468,5 @@
 "middle of the way.)"
 
-#: ../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 "
@@ -1467,5 +1474,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 "
@@ -1473,5 +1480,5 @@
 msgstr ""
 
-#: ../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"
@@ -1501,38 +1508,38 @@
 msgstr "Kahekordista sõlmed, mis on mitme tee poolt kasutatud."
 
-#: ../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 "See on üksik sõlm."
 
-#: ../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 "Ükski neist sõlmedest ei ole millegi küljes."
 
-#: ../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 "Ükski selle tee sõlmedest ei ole millegi muu küljes."
 
-#: ../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 "Seda valikut ei ole võimalik uuestiliitmiseks kasutada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vali miski:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* üks sildiga sõlm või"
 
-#: ../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 "* üks sõlm, mis on kasutusel rohkem kui ühes tees või"
 
-#: ../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 ""
 "* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest"
 
-#: ../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"
@@ -1541,5 +1548,5 @@
 "teedest"
 
-#: ../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."
@@ -1548,5 +1555,5 @@
 "ühes neist teedest"
 
-#: ../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"
@@ -1559,9 +1566,9 @@
 "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Lahtisulatatud sõlm"
 
-#: ../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"
@@ -1569,5 +1576,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"
@@ -1608,12 +1615,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Värskendab valitud primitiivid serverist"
+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 ""
@@ -1629,6 +1635,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Uuenda valik"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1642,5 +1649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Ei ole valitud primitiive mida uuendada."
 
@@ -1648,4 +1656,9 @@
 msgid "Selection empty"
 msgstr "Tühi valik"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Uuenda valik"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1790,7 +1803,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Muuda {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1912,9 +1925,9 @@
 msgstr "Alla laetud GPX andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1922,5 +1935,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 ""
@@ -1936,7 +1949,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Kasutajanimi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1970,7 +1982,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -1980,7 +1992,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Viga allaladimise ajal"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1994,5 +2005,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
@@ -2023,6 +2034,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 "valitud"
@@ -2040,26 +2051,26 @@
 msgstr "Lisa teele sõlm"
 
-#: ../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 "Ühenda olemasolev tee sõlmega"
 
-#: ../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 "Ühenda uus sõlm olemasoleva teega"
 
-#: ../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 "Lisa sõlm teele ja ühenda"
 
-#: ../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 "Loo uus sõlm."
 
-#: ../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 "Vali kursori all olev sõlm."
 
-#: ../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."
@@ -2068,47 +2079,45 @@
 msgstr[1] "Lisa {0} teele uus sõlm."
 
-#: ../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 "Alusta uut teed viimasest sõlmest."
 
-#: ../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 "Jätke teed viimasest sõlmest."
 
-#: ../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 "Lõpeta joonistamine."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Alade loomine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Joonista soovitud suurusega ristkülik ning vabasta seejärel hiire nupp."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Joonista soovitud suurusega ristkülik ning vabasta seejärel hiire nupp."
 
-#: ../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 "Pööramise lõpetamiseks vabasta hiire nupp."
-
-#: ../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:422
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr ""
 
@@ -2163,8 +2172,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2190,67 +2207,70 @@
 msgstr ""
 
-#: ../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 "Otsi..."
 
-#: ../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 "Otsi objekte."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Palun sisesta otsingu tekst"
 
-#: ../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 "regulaaravaldis"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "asenda valik"
 
-#: ../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 "lisa valikusse"
 
-#: ../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 "eemalda valikust"
 
-#: ../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 "tõstutundlik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regulaaravaldis"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2258,34 +2278,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2293,43 +2313,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2339,51 +2359,51 @@
 msgstr ""
 
-#: ../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 "Otsi"
 
-#: ../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 "Alusta otsingut"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Leitud {0} vastet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2549,6 +2569,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
@@ -2673,5 +2693,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 ""
@@ -2692,9 +2712,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 "parameeter ''{0}'' ei tohi olla null"
+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"
@@ -2730,5 +2753,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 ""
@@ -2736,6 +2759,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."
@@ -2744,5 +2767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2753,5 +2776,15 @@
 msgstr ""
 
-#: ../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"
@@ -2833,5 +2866,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"
@@ -2936,7 +2969,13 @@
 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
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 msgstr ""
 
@@ -3117,5 +3156,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
@@ -3129,5 +3168,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 ""
@@ -3135,4 +3174,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3190,32 +3265,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr ""
-
-#: ../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 ""
 
@@ -3240,45 +3316,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 "parameeter ''{0}'' ei tohi olla null"
+
+#: ../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
@@ -3289,6 +3348,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 ""
 
@@ -3299,145 +3359,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr ""
 
-#: ../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
@@ -3447,5 +3507,5 @@
 msgstr[1] "punktid"
 
-#: ../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
@@ -3455,6 +3515,6 @@
 msgstr[1] "teed"
 
-#: ../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
@@ -3464,13 +3524,13 @@
 msgstr[1] "seosed"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -3478,5 +3538,5 @@
 msgstr "taust"
 
-#: ../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 ""
@@ -3555,5 +3615,5 @@
 msgstr "Rohkem ei näidata"
 
-#: ../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
@@ -3561,32 +3621,32 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr ""
 
-#: ../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"
@@ -3595,5 +3655,5 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3602,33 +3662,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Eelitingimuste rikkumine"
 
-#: ../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
@@ -3636,9 +3696,9 @@
 msgstr "Vastuolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Tundmatu host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3855,5 +3915,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 "Muuda"
@@ -3979,10 +4039,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 "kiht ei ole nimekirjas"
 
-#: ../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"
@@ -4111,5 +4171,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"
@@ -4118,5 +4178,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"
@@ -4126,5 +4186,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 "Liikmed"
@@ -4553,5 +4613,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 ""
@@ -4609,6 +4669,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 ""
@@ -4737,4 +4795,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"
@@ -4831,5 +4890,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"
@@ -4840,5 +4899,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"
@@ -4879,7 +4938,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Sisesta kõigi vastuolude kohta väärtused."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4965,5 +5023,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
@@ -5058,5 +5116,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"
@@ -5112,11 +5170,11 @@
 msgstr "Näita kõigi valitud objektide ajalugu."
 
-#: ../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
@@ -5124,13 +5182,13 @@
 msgstr "Lae uuesti"
 
-#: ../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 "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
 
-#: ../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 ""
@@ -5187,7 +5245,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] "See muudab kuni {0} objekti."
@@ -5195,5 +5252,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 "Tühi väärtus kustutab võtme."
 
@@ -5218,4 +5276,11 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
+#: ../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] "See muudab kuni {0} objekti."
+msgstr[1] "See muudab kuni {0} objekti."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5292,60 +5357,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 "Seosed"
 
-#: ../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 "Ava kõikide seoste nimekiri"
 
-#: ../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 "Seosed: {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 "Ava toimetajas valitud seos"
 
-#: ../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 "Kustuta valitud seos"
 
-#: ../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 "Loo uus seos"
 
-#: ../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 "Kustuta valitud seos"
-
-#: ../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 "Vali miski:"
-
-#: ../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 "Kustuta valitud seos"
-
-#: ../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 "Lae alla liikmed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5501,5 +5562,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}"
@@ -5738,18 +5799,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 ""
@@ -5772,5 +5833,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}"
@@ -5852,12 +5913,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Alade loomine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Liiguta hetkel valitud liiget allapoole"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5868,7 +5927,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 "Palun sisesta koha nimi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5878,12 +5936,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Liiguta hetkel valitud liiget ülespoole"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Liiguta hetkel valitud liiget ülespoole"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5942,7 +5998,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Lahuta tee valitud sõlme kohalt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5951,7 +6006,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Valitud tee ei sisalda valitud sõlme"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5975,7 +6029,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Kustuta valitud kiht"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5992,12 +6045,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Liiguta hetkel valitud liiget ülespoole"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "PAlun vali rida muutmiseks"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6013,7 +6064,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Sisesta otsitava koha nimi:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6027,7 +6077,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Otsi..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6961,7 +7010,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "lähedal"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7006,5 +7054,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 ""
@@ -7018,5 +7066,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 ""
@@ -7027,5 +7075,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 ""
@@ -7034,19 +7082,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 ""
@@ -7056,32 +7104,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 ""
@@ -7103,37 +7151,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 ""
@@ -7141,5 +7189,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 ""
@@ -7147,9 +7195,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 ""
@@ -7158,24 +7206,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 "parameeter ''{0}'' ei tohi olla null"
+
+#: ../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}"
@@ -7188,4 +7246,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Suumi {0}"
+
+#: ../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 "Ajalugu"
+
+#: ../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
@@ -7198,16 +7274,64 @@
 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
+msgid "not present"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "tundmatu"
+
+#: ../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
+msgid "anonymous"
 msgstr ""
 
@@ -7233,4 +7357,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 "Versioon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "valitud"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7575,9 +7714,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] "Objektid muuta:"
-msgstr[1] "Objektid muuta:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7659,13 +7798,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
@@ -7732,5 +7871,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}..."
@@ -7742,5 +7881,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 ""
@@ -7766,5 +7905,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"
@@ -7819,43 +7958,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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 "Kohanda värvi"
 
 #: ../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"
@@ -7863,6 +8002,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"
@@ -7952,10 +8091,10 @@
 msgstr[1] ""
 
-#: ../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 "Muuda andme kihiks"
 
-#: ../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."
@@ -7965,43 +8104,43 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../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 "Muudetud sellest: {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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8010,9 +8149,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8020,5 +8159,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8078,33 +8217,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} kustutatud.)"
-msgstr[1] " ({0} kustutatud.)"
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -8112,5 +8251,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"
@@ -8119,5 +8258,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"
@@ -8125,5 +8264,5 @@
 msgstr[1] "punktid"
 
-#: ../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"
@@ -8132,5 +8271,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8139,5 +8278,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8146,9 +8285,9 @@
 msgstr[1] "{0} punkti"
 
-#: ../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"
@@ -8156,5 +8295,5 @@
 msgstr[1] "markerid"
 
-#: ../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"
@@ -8163,14 +8302,14 @@
 msgstr[1] "{0} koosneb {1} markerist"
 
-#: ../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 "Sünkroniseeri heli"
 
-#: ../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 "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema."
 
-#: ../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
@@ -8178,14 +8317,14 @@
 msgstr "Heli sünkroniseeritud punktis {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 "Ei saa sükroniseerida kihis mis mängib."
 
-#: ../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 "Loo heli marker mängimise alguses"
 
-#: ../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 "
@@ -8193,13 +8332,13 @@
 msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
 
-#: ../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 "Pole heli markerit millest nihutada."
 
-#: ../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 "Näita/Peida Tekst/Ikoonid"
 
-#: ../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 "Muuda markertekstide ja ikoonide nähtavust."
@@ -8265,5 +8404,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 "PAlun vali rida muutmiseks"
@@ -8277,5 +8416,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."
@@ -8986,12 +9125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Liiguta valitud sõlmed ringiks."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Muuda kõikide valitud objektide võtme väärtust"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9005,17 +9142,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Lisa teele sõlm"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Värskenda valikute nimekirja."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Kustuta valitud seos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9629,5 +9763,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}''."
@@ -9654,5 +9788,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}."
@@ -9660,5 +9794,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}"
@@ -9671,5 +9805,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}''."
@@ -9820,5 +9954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9827,38 +9961,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 ""
@@ -9866,19 +10000,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 "Puudulik <member> määratlus 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 "Keelatud objekti number 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 ""
@@ -9889,9 +10023,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 ""
@@ -9901,25 +10035,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 ""
@@ -9927,5 +10061,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9934,5 +10068,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9940,5 +10074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9947,13 +10081,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 "Valmistan ette OSM andmeid..."
 
-#: ../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 ""
@@ -10167,7 +10301,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Pistikrakenduste uuendamine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10306,35 +10439,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 "tundmatu"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10949,47 +11051,46 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Liiguta valitud kiht ühe rea võrra üles."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11005,24 +11106,24 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Viga {0} parsimisel"
 
-#: ../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 "Ei suutnud lugeda \"{0}\""
 
-#: ../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."
@@ -11031,34 +11132,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11066,69 +11167,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11137,9 +11238,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11148,65 +11249,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11214,13 +11315,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11241,5 +11342,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11252,37 +11353,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11294,18 +11395,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11332,34 +11433,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11371,18 +11472,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11390,5 +11491,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11396,74 +11497,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11471,30 +11572,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11502,29 +11603,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11533,13 +11634,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"
@@ -11547,5 +11648,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"
@@ -11553,14 +11654,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"
@@ -11568,14 +11669,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"
@@ -11583,64 +11684,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11648,25 +11749,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11676,14 +11777,14 @@
 msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)"
 
-#: ../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 ""
 
-#: ../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"
@@ -11691,5 +11792,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
@@ -11697,5 +11798,5 @@
 msgstr ""
 
-#: ../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"
@@ -11703,34 +11804,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11739,18 +11840,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11857,9 +11958,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11876,11 +11977,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 ""
 
 #: ../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 ""
@@ -11890,5 +11991,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 ""
@@ -12098,5 +12199,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12518,5 +12619,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12595,5 +12696,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12726,7 +12827,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Kihid"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12890,42 +12990,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 ""
 
-#: ../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 "Mastaap"
-
-#: ../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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -12961,7 +13060,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "suurendusaste"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13308,6 +13406,6 @@
 msgstr ""
 
-#: ../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
@@ -13315,5 +13413,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13400,5 +13498,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13527,18 +13625,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13690,80 +13788,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13771,86 +13869,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14025,17 +14123,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14086,13 +14184,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14136,61 +14234,64 @@
 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 "Lae alla"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Lae kaardi andmed OSM serverist"
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Sulanda {0} sõlm(e)"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14293,28 +14394,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14325,55 +14426,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -26772,57 +26873,36 @@
 #~ msgstr "Lae OSMi serverisse"
 
+#~ msgid "Move"
+#~ msgstr "Liiguta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Palun sisesta enne soovitud kordinaadid."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Vali enne järjehoidja."
+
 #~ msgid "File could not be found."
 #~ msgstr "Faili ei leitud"
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Laadimine OSM API-le ebaõnnestus"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktne relatsioon"
+#~ msgid "Unknown file extension."
+#~ msgstr "Tundmatu faililaiend."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Salvestamata muudatused"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
 
 #~ msgid "Error while parsing"
 #~ msgstr "Viga parsimisel"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Palun sisesta enne soovitud kordinaadid."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Vali enne järjehoidja."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Palun sisesta otsingutekst"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "zoom"
-#~ msgstr "suurendus"
-
-#~ msgid "Move"
-#~ msgstr "Liiguta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Andmekiht"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tundmatu faililaiend."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Salvestamata muudatused"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
 
 #~ msgid "their version:"
@@ -26857,4 +26937,16 @@
 #~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
 
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Palun sisesta otsingutekst"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
+
+#~ msgid "zoom"
+#~ msgstr "suurendus"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -26941,4 +27033,7 @@
 #~ msgstr "Kõik teed olid tühjad."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
+
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
@@ -27041,4 +27136,7 @@
 #~ msgstr "Kustuta {1} {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktne relatsioon"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
@@ -27052,4 +27150,7 @@
 #~ msgid "Conflict detected"
 #~ msgstr "Avastatud konflikt"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Laadimine OSM API-le ebaõnnestus"
 
 #~ msgid "Primitive already deleted"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 18508)
+++ applications/editors/josm/i18n/po/fi.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-03 07:42+0000\n"
-"Last-Translator: Jyri-Petteri Paloposki <Unknown>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:30+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\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:22+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 "Virhe"
@@ -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"
@@ -314,5 +315,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
@@ -330,6 +331,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
@@ -340,5 +341,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
@@ -459,5 +460,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
@@ -499,5 +500,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
@@ -506,6 +507,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"
@@ -690,5 +692,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
@@ -701,5 +703,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"
@@ -771,5 +773,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
@@ -777,28 +787,28 @@
 msgstr "Parametr ''{0}'' ei saa olla \"null\""
 
-#: ../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 "Tuonnin aikana oli {0} konfliktia."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikti latauksen aikana"
 
-#: ../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}"
@@ -835,10 +845,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 "GPX-vienti..."
 
 #: ../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 "Vie data GPX-tiedostoon."
@@ -851,11 +861,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
@@ -886,5 +895,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
@@ -899,17 +907,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
@@ -969,5 +978,5 @@
 msgstr "Yhdistää pisteen lähimpään polun segmenttiin."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Yhdistä piste ja polku."
@@ -998,20 +1007,19 @@
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Keskeytetään..."
-
-#: ../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 "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1152,7 +1160,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Ladataan dataa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1302,10 +1309,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 "Tallenna"
 
 #: ../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 "Tallenna tämänhetkinen data."
@@ -1362,10 +1369,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 "Tallenna nimellä..."
 
 #: ../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 "Tallenna data uuteen tiedostoon."
@@ -1407,25 +1414,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 "Sulje"
 
-#: ../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 "Katkaise polku"
 
-#: ../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 "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../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 "Valintaa ei voida käyttää jakamiseen."
 
-#: ../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."
@@ -1433,5 +1440,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../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 "
@@ -1447,9 +1454,9 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../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 "Valitut pisteet eivät ole samalla polulla."
 
-#: ../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."
@@ -1457,10 +1464,10 @@
 msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
 
-#: ../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 "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../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 "
@@ -1470,5 +1477,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../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 "
@@ -1478,5 +1485,5 @@
 "tulisi tarkistaa että jäsenyydet ovat oikein.</html>"
 
-#: ../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 "
@@ -1484,5 +1491,5 @@
 msgstr ""
 
-#: ../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"
@@ -1512,38 +1519,38 @@
 msgstr "Monistaa pisteet, jotka ovat monen polun käytössä."
 
-#: ../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 "Tämä piste ei ole yhdistettynä mihinkään muuhun."
 
-#: ../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 "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa."
 
-#: ../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 "Mikään valitun polun pisteistä ei ole osana muita polkuja."
 
-#: ../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 "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Valitse joko:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Yksi piste jolla on tageja, tai"
 
-#: ../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 "* Yksi piste, joka on useamman polun käytössä, tai"
 
-#: ../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 ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
 
-#: ../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"
@@ -1552,5 +1559,5 @@
 "polkujen käytössä, tai"
 
-#: ../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."
@@ -1559,5 +1566,5 @@
 "käytössä."
 
-#: ../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"
@@ -1570,9 +1577,9 @@
 "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Irroitettu piste"
 
-#: ../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"
@@ -1580,5 +1587,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"
@@ -1619,12 +1626,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Päivittää nykyisen tietotason objektit palvelimelta."
+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 ""
@@ -1640,5 +1646,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Päivitä valinnat"
 
@@ -1653,5 +1660,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Päivitettäviä objekteja ei valittuna."
 
@@ -1659,4 +1667,9 @@
 msgid "Selection empty"
 msgstr "Valinta tyhjä"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Päivitä valinnat"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1666,8 +1679,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 ""
-"Lähetä kaikki nykyisessä tietotasossa olevat muutokset OSM-palvelimelle"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1805,7 +1816,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Lähetetään dataa..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1927,9 +1938,9 @@
 msgstr "Ladattu GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Ladataan dataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1937,5 +1948,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 ""
@@ -1951,7 +1962,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Käyttäjän nimi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1967,7 +1977,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Peruuta lähetys ja jatka muokkausta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1996,7 +2005,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Konflikti latauksen aikana"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2010,5 +2018,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
@@ -2042,6 +2050,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 "valitut"
@@ -2059,26 +2067,26 @@
 msgstr "Lisää piste polkuun"
 
-#: ../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 "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../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 "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../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 "Lisää piste polkuun ja yhdistä"
 
-#: ../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 "Luo uusi piste."
 
-#: ../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 "Valitse kursorin alla oleva piste."
 
-#: ../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."
@@ -2087,47 +2095,46 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../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 "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../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 "Jatka polkua viimeisestä pisteestä."
 
-#: ../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 "Lopeta piirtäminen."
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Luo alueita"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike."
 
-#: ../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 "Vapauta hiiren painike pyörityksen lopettamiseksi."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion."
 
@@ -2182,8 +2189,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2211,67 +2226,70 @@
 "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla."
 
-#: ../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 "Etsi..."
 
-#: ../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 "Etsi objekteja."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Anna hakusana."
 
-#: ../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 "säännöllinen lauseke"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "korvaa valinta"
 
-#: ../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 "lisää valintaan"
 
-#: ../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 "poista valinnasta"
 
-#: ../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 "kirjainkoko merkitsee"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "säännöllinen lauseke"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2279,34 +2297,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2314,43 +2332,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2360,51 +2378,51 @@
 msgstr ""
 
-#: ../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 "Etsi"
 
-#: ../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 ""
 
-#: ../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 "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../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 "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../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 "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../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 "Löytyi {0} osumaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2575,6 +2593,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
@@ -2699,5 +2717,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 ""
@@ -2718,9 +2736,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 "Parametr ''{0}'' ei saa olla \"null\""
+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"
@@ -2756,5 +2777,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 "Katkaise polku"
@@ -2762,6 +2783,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."
@@ -2773,5 +2794,5 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2782,5 +2803,15 @@
 msgstr ""
 
-#: ../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"
@@ -2862,5 +2893,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"
@@ -2967,8 +2998,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 "Oletusarvo on \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parametr ''{0}'' ei saa olla \"null\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3148,5 +3185,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
@@ -3160,5 +3197,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 ""
@@ -3166,4 +3203,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 "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
+
+#: ../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 ""
 
@@ -3221,32 +3294,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Virhe: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varoitus: {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 ""
 
@@ -3271,45 +3345,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 "Parametr ''{0}'' ei saa olla \"null\""
+
+#: ../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
@@ -3320,6 +3377,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 ""
 
@@ -3330,146 +3388,146 @@
 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 ""
 
-#: ../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 ""
 
-#: ../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 "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../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 "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../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 "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../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 "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../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 "Useita \"via\" -jäseniä."
 
-#: ../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 "Tuntematon rooli \"{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 ""
 
-#: ../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 "Ei \"from\"-roolin tietä."
 
-#: ../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 "Ei \"to\"-roolin tietä."
 
-#: ../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 "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../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 ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
-#: ../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 "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../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 ""
 
-#: ../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 "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
 
-#: ../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 ""
 
-#: ../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 "Multipolygonissa jäsenenä muu kuin tie: {0}"
 
-#: ../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 "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "ei tageja"
 
-#: ../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 "teksti"
 
-#: ../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 "Virhe: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varoitus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "epäaktiivinen"
 
-#: ../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
@@ -3479,5 +3537,5 @@
 msgstr[1] "pistettä"
 
-#: ../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
@@ -3487,6 +3545,6 @@
 msgstr[1] "polkua"
 
-#: ../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
@@ -3496,13 +3554,13 @@
 msgstr[1] "relaatiot"
 
-#: ../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 "tagiton polku"
 
-#: ../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 "keskeneräinen polku"
 
-#: ../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
@@ -3510,5 +3568,5 @@
 msgstr "tausta"
 
-#: ../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 "korostus"
@@ -3587,5 +3645,5 @@
 msgstr "Älä näytä uudelleen"
 
-#: ../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
@@ -3593,32 +3651,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 "keskeneräinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "tie"
 
-#: ../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 "rata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../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"
@@ -3627,5 +3685,5 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3634,33 +3692,33 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../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
@@ -3668,9 +3726,9 @@
 msgstr "Ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3692,7 +3750,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Peruuta muutokset ja sulje tämä ikkuna"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3882,5 +3939,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 "Muokkaa"
@@ -4006,10 +4063,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 "taso ei ole listassa."
 
-#: ../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"
@@ -4138,5 +4195,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"
@@ -4145,5 +4202,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"
@@ -4153,5 +4210,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 "Jäsenet"
@@ -4580,5 +4637,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 ""
@@ -4636,6 +4693,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 ""
@@ -4764,4 +4819,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"
@@ -4858,5 +4914,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"
@@ -4867,5 +4923,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"
@@ -4906,7 +4962,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Syötä arvot kaikille ristiriidoille."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4926,7 +4981,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Lähetys <strong>epäonnistui</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -4994,5 +5048,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
@@ -5086,5 +5140,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"
@@ -5140,11 +5194,11 @@
 msgstr "Näytä valittujen kohteiden historia."
 
-#: ../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
@@ -5152,13 +5206,13 @@
 msgstr "Lataa uudelleen"
 
-#: ../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 "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
 
-#: ../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 ""
@@ -5215,7 +5269,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] "Olet muuttamassa {0} kohdetta."
@@ -5223,5 +5276,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 "Tyhjä arvo poistaa avaimen."
 
@@ -5246,4 +5300,11 @@
 msgstr[1] ""
 
+#: ../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] "Olet muuttamassa {0} kohdetta."
+msgstr[1] "Olet muuttamassa {0} kohdetta."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5320,60 +5381,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 "Relaatiot"
 
-#: ../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 "Avaa lista kaikista relaatioista."
 
-#: ../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 "Relaatiot: {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 "Avaa valittu relaatio muokkaimeen"
 
-#: ../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 "Poista valittu relaatio"
 
-#: ../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 "Luo uusi relaatio"
 
-#: ../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 "Poista valittu relaatio"
-
-#: ../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 "Valitse joko:"
-
-#: ../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 "Poista valittu relaatio"
-
-#: ../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 "Lataa jäsenet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5530,5 +5587,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}"
@@ -5767,18 +5824,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 ""
@@ -5801,5 +5858,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}"
@@ -5881,12 +5938,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Luo alueita"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Sulje valittuna oleva avoin muutoskokoelma"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5897,7 +5952,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 "Ole hyvä ja anna nimi sijainnille."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5907,12 +5961,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Siirrä valittuja jäseniä ylöspäin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Siirrä valittuja jäseniä ylöspäin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5972,7 +6024,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Katkaisee polun valitun pisteen kohdalta."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5981,7 +6032,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Valittu polku ei sisällä valittua pistettä."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6005,7 +6055,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "GPX-jälkeä ei valittuna"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6019,17 +6068,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Sulje ikkuna ja peruuta lataus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Sulje valittuna oleva avoin muutoskokoelma"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Ole hyvä ja valitse muokattava rivi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6045,7 +6091,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Syötä haettavan paikan nimi:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6059,12 +6104,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Etsi..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Suunta, josta etsitään maata"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -6994,7 +7037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "lähellä"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7039,5 +7081,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 ""
@@ -7051,5 +7093,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 ""
@@ -7060,5 +7102,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 ""
@@ -7067,19 +7109,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 ""
@@ -7089,32 +7131,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 ""
@@ -7136,37 +7178,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 ""
@@ -7174,5 +7216,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 ""
@@ -7180,9 +7222,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 ""
@@ -7191,24 +7233,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 "parametri ''{0}'' ei saa olla tyhjä"
+
+#: ../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}"
@@ -7221,4 +7273,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoomaa ongelmaan"
+
+#: ../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 "historia"
+
+#: ../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
@@ -7231,17 +7301,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 "koillinen"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "tuntematon"
+
+#: ../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 "Anonyymi"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7266,4 +7386,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 "Versio {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "poistettu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7612,9 +7747,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] "Muokattavat objektit:"
-msgstr[1] "Muokattavat objektit:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7696,13 +7831,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 "Lataa lista avonaisista muutoskokoelmista palvelimelta"
 
-#: ../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 "Sulje valittuna oleva avoin muutoskokoelma"
 
-#: ../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
@@ -7769,5 +7904,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}..."
@@ -7779,5 +7914,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 "Geo-merkityt kuvat"
@@ -7803,5 +7938,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"
@@ -7856,43 +7991,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-piste"
 
 #: ../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 "Muokkaa viivanpiirtotyyliä"
 
 #: ../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 "Käytä globaaleja asetuksia."
 
 #: ../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 "Piirrä viivat pisteiden välillä tällä tasolla."
 
 #: ../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 "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
 #: ../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 "Viivanpiirtoasetukset"
 
 #: ../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 "Muokkaa väriä"
 
 #: ../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"
@@ -7900,6 +8035,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"
@@ -7989,10 +8124,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../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 "Muuta datatasoksi"
 
-#: ../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."
@@ -8002,43 +8137,43 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../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 "Muutettu jäljestä {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 "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../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 "Lataa kaikki  alueella:"
 
-#: ../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} metriä"
 
-#: ../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 "Yhden pyynnön enimmäisalue:"
 
-#: ../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} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8047,9 +8182,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</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 "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../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 "
@@ -8057,5 +8192,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8112,37 +8247,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Sulje ikkuna ja peruuta lataus"
-
-#: ../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} poistettu)"
-msgstr[1] " ({0} poistettu)"
-
-#: ../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} koostuu:"
 
-#: ../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 ""
 
-#: ../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 "Muuta GPX-tasoksi"
 
-#: ../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."
@@ -8152,5 +8286,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8159,5 +8293,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"
@@ -8165,5 +8299,5 @@
 msgstr[1] "pisteet"
 
-#: ../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"
@@ -8172,5 +8306,5 @@
 msgstr[1] "jälki, jossa on {0} pistettä"
 
-#: ../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"
@@ -8179,5 +8313,5 @@
 msgstr[1] "{0}:ssä on {1} jälkeä"
 
-#: ../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"
@@ -8186,9 +8320,9 @@
 msgstr[1] "{0} pistettä"
 
-#: ../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 ""
 
-#: ../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"
@@ -8196,5 +8330,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8203,14 +8337,14 @@
 msgstr[1] ""
 
-#: ../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 "Tahdista ääni"
 
-#: ../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 "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi."
 
-#: ../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
@@ -8218,14 +8352,14 @@
 msgstr "Ääni tahdistettu pisteessä {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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8233,13 +8367,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Näytä/piilota teksti/kuvakkeet"
 
-#: ../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 ""
@@ -8303,5 +8437,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 "Ole hyvä ja valitse muokattava rivi."
@@ -8315,5 +8449,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."
@@ -9036,12 +9170,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Poista valittu lähde listasta."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9055,17 +9187,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Lisää kommentti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Suljet valitut avonaiset muutoskokoelmat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Poista valittu relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9693,5 +9822,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}''."
@@ -9718,5 +9847,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}."
@@ -9724,5 +9853,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}"
@@ -9735,5 +9864,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}''."
@@ -9884,5 +10013,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9891,38 +10020,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 ""
@@ -9930,19 +10059,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 "Relaation jäsenen määrittely puutteellinen: ei voi olla 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 "Virheellinen objekti (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 ""
@@ -9953,9 +10082,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 ""
@@ -9965,25 +10094,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 ""
@@ -9991,5 +10120,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9998,5 +10127,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10004,5 +10133,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10011,13 +10140,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 "Valmistellaan OSM-karttatietoja..."
 
-#: ../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 ""
@@ -10167,13 +10296,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} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-"uudelleen."
 msgstr[1] ""
-"{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-"uudelleen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10235,7 +10360,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Päivitä liitännäiset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10378,35 +10502,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 "tuntematon"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11034,47 +11127,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 "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../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 "Tutkii hakemistoa"
 
-#: ../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 "Siirrä valittu taso rivi ylöspäin."
-
-#: ../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 "Luetaan kuvia..."
 
-#: ../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 ""
 
-#: ../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 "Tutkii hakemistoa {0}"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../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."
@@ -11090,24 +11182,24 @@
 msgstr "Lataa kuvat uutena tasona."
 
-#: ../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-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../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 ""
 
-#: ../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 "Virhe tulkittaessa {0}:aa"
 
-#: ../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 "Ei voitu lukea \"{0}\":aa"
 
-#: ../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."
@@ -11118,34 +11210,34 @@
 "kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<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 "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../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:n aika (lue ylläolevasta kuvasta): "
 
-#: ../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 " [pp/kk/vvvv tt: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 ""
 
-#: ../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 "Ei päivämäärää"
 
-#: ../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 "Avaa toinen kuva"
 
-#: ../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 ""
 
-#: ../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"
@@ -11155,69 +11247,69 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../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 "Virheellinen päivämäärä"
 
-#: ../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 "<Ei ladattuja GPS-jälkiä>"
 
-#: ../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-jälki: "
 
-#: ../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 "Avaa toinen GPX-jälki"
 
-#: ../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 "Aikavyöhyke: "
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Kaikki kuvat"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Kohdista kuvia GPX-jälkeen"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Valitse GPX-jälki"
 
-#: ../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 "GPX-jälkeä ei valittuna"
 
-#: ../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 ""
@@ -11226,9 +11318,9 @@
 msgstr ""
 
-#: ../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 "Virheellinen aikavyöhyke"
 
-#: ../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 ""
@@ -11237,26 +11329,26 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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-jälki ladattu"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11264,39 +11356,39 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11304,13 +11396,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11331,5 +11423,5 @@
 msgstr "Virhe tiedostossa {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11342,37 +11434,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 "Virhe ladattaessa tiedostoa"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11384,18 +11476,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11422,34 +11514,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11461,18 +11553,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "Ranskan kiinteistörekisteri-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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11480,5 +11572,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11486,74 +11578,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11561,30 +11653,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11592,29 +11684,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11623,13 +11715,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"
@@ -11637,5 +11729,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"
@@ -11643,14 +11735,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"
@@ -11658,14 +11750,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"
@@ -11673,64 +11765,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11738,25 +11830,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11766,14 +11858,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11781,5 +11873,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
@@ -11787,5 +11879,5 @@
 msgstr ""
 
-#: ../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"
@@ -11793,34 +11885,34 @@
 msgstr ""
 
-#: ../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 "Tyhjä taso"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11829,18 +11921,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11947,9 +12039,9 @@
 msgstr "Luo kopio polusta"
 
-#: ../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 ""
@@ -11966,11 +12058,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 "Tuo jälki GPX-tasolta"
 
 #: ../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 "Poista olemassa oleva jälki"
@@ -11980,5 +12072,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 "GPX-tasoa ei löytynyt."
@@ -12188,5 +12280,5 @@
 msgstr "Näytä kuvat, joita ei ole geo-merkitty"
 
-#: ../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 "Tuodut kuvat"
@@ -12618,5 +12710,5 @@
 msgstr "Kahden pisteen välinen kulma"
 
-#: ../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 "Taso, jolla tehdään mittaukset"
@@ -12695,5 +12787,5 @@
 msgstr "OpenStreetBugs-latauslooppi"
 
-#: ../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 "Näyttä OpenStreetBugs-ongelmat"
@@ -12832,7 +12924,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Taso"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12998,42 +13089,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 ""
 
-#: ../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 "Zoomaus"
-
-#: ../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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13069,7 +13159,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "zoom-taso"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13419,6 +13508,6 @@
 msgstr "Oletko varma?"
 
-#: ../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
@@ -13426,5 +13515,5 @@
 msgstr "Tarkistusvirheet"
 
-#: ../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 "Ei virheitä"
@@ -13515,5 +13604,5 @@
 msgstr "muut tarkistukset"
 
-#: ../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}"
@@ -13615,7 +13704,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Yhdistämättömät polut"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13645,18 +13733,18 @@
 msgstr "Risteävät polut"
 
-#: ../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 "Päällekkäiset pisteet"
 
-#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../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 ""
@@ -13815,81 +13903,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 "Piirto-ongelma"
 
-#: ../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 "Avain \"{0}\" virheellinen."
 
-#: ../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 "Tyhjät arvot"
 
-#: ../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 "Epäkelpo avain"
 
-#: ../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 "Virheellinen välilyönti avaimessa"
 
-#: ../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 "Arvossa välilyönti alussa tai lopussa"
 
-#: ../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 "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../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 "Tarkista ominaisuuksien avaimet"
 
-#: ../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 ""
 "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13900,88 +13988,88 @@
 "php/User:JLS/speller )"
 
-#: ../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 "Lisää tiedosto"
 
-#: ../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 ""
 
-#: ../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 "Poista valittu lähde listasta."
 
-#: ../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 "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../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 "Tarkista ominaisuuksien arvot."
 
-#: ../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 ""
 "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin."
 
-#: ../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 "Etsi FIXME:t"
 
-#: ../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 "Etsii solmut ja polut joissa arvona FIXME"
 
-#: ../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 "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../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 "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
-#: ../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 "Käytä oletussääntötiedostoa."
 
-#: ../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 "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
 
-#: ../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 "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../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 ""
 "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14157,17 +14245,17 @@
 msgstr "Etsii polut joiden päätesolmu on hyvin lähellä jotain muuta polkua."
 
-#: ../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 "Polun päätesolmu lähellä tietä"
 
-#: ../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 "Polun päätesolmu lähellä toista polkua"
 
-#: ../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 "Polun solmu lähellä toista polkua"
 
-#: ../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 ""
@@ -14222,13 +14310,13 @@
 "oikealla)."
 
-#: ../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 "Rantaviiva väärin päin: maan pitää olla polun vasemmalla puolella."
 
-#: ../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 "Vesialue väärin päin: maan pitää olla polun vasemmalla puolella."
 
-#: ../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 "Maa-alue väärin päin: maan pitää olla polun vasemmalla puolella."
@@ -14272,61 +14360,66 @@
 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 "Lataa"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Lataa karttadataa OSM-palvelimelta."
+
+#: ../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>Valittua tasoa <br>{0}<br>ei voi yhdistää mihinkään nykyisistä "
+"tasoista.</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 "Poistetaan pisteiden kaksoiskappaleet..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "ohje"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14429,28 +14522,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14461,13 +14554,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"
@@ -14476,42 +14569,42 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 "Tallenna WMS-taso tiedostoon"
 
-#: ../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 "Lataa WMS-taso tiedostosta"
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -18935,14 +19028,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Arkeologinen kaivaus"
+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 "Muokkaa piknik-paikan ominaisuuksia"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26911,36 +27002,154 @@
 msgstr ""
 
+#~ msgid "help"
+#~ msgstr "ohje"
+
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "File not found"
+#~ msgstr "Tiedostoa ei löytynyt"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Avaa selaimessa"
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Poista {1} {0}"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Virhe ladattaessa sivua {0}"
+
 #~ msgid "File could not be found."
 #~ msgstr "Tiedostoa ei löytynyt."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Valitse ensin kirjanmerkki."
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
 
 #~ msgid "Please enter a search string"
 #~ msgstr "Anna haettava merkkijono"
 
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "name"
-#~ msgstr "nimi"
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
 
 #~ msgid "zoom"
 #~ msgstr "zoom"
+
+#~ msgid "Validate"
+#~ msgstr "Tarkista"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Vain kaksi pistettä sallittu"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Vain yksi piste valittuna"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-elementti muussa kuin polussa."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
 
 #~ msgid ""
@@ -26951,131 +27160,4 @@
 #~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
 
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "Validate"
-#~ msgstr "Tarkista"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
-
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
@@ -27128,4 +27210,7 @@
 #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
 
+#~ msgid "Error while parsing"
+#~ msgstr "Virhe jäsennettäessä"
+
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
@@ -27153,4 +27238,7 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -27245,4 +27333,7 @@
 #~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
@@ -27278,4 +27369,7 @@
 #~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
 
+#~ msgid "Select a bookmark first."
+#~ msgstr "Valitse ensin kirjanmerkki."
+
 #~ msgid "Move Down"
 #~ msgstr "Siirrä alaspäin"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 18508)
+++ applications/editors/josm/i18n/po/fr.po	(revision 18656)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-05 08:28+0000\n"
-"Last-Translator: Baptiste Darthenay <e5p3r0-rosetta@yahoo.fr>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-15 20:47+0000\n"
+"Last-Translator: David Perrenoud <david.perrenoud@gmail.com>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -46,18 +46,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
@@ -67,6 +67,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
@@ -74,11 +73,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
@@ -93,4 +92,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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "Erreur"
@@ -208,6 +209,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"
@@ -322,5 +323,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
@@ -338,6 +339,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
@@ -348,5 +349,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
@@ -468,5 +469,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
@@ -508,5 +509,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
@@ -515,6 +516,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"
@@ -702,5 +704,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
@@ -713,5 +715,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"
@@ -785,5 +787,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
@@ -791,28 +801,28 @@
 msgstr "Le paramètre ''{0}'' ne doit pas être nul."
 
-#: ../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 "Il y a eu {0} conflits durant l'import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Conflits durant le téléchargement"
 
-#: ../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 "({0}/{1}) Chargement des parents du nœud {2}"
 
-#: ../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 "({0}/{1}) Chargement des parents du way {2}"
 
-#: ../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}"
@@ -849,10 +859,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 "Exporter en 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 "Exporter les données vers un fichier GPX."
@@ -865,11 +875,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
@@ -900,5 +909,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
@@ -913,17 +921,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
@@ -983,5 +992,5 @@
 msgstr "Joindre un nœud au chemin le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Joindre le nœud et la ligne"
@@ -1012,22 +1021,19 @@
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Interruption en cours..."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr "Annuler la fusion"
+
+#: ../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
+msgstr "Clicker pour fusionner les noeuds"
+
+#: ../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 ""
-"Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin "
-"encore utilisé"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1169,7 +1175,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Télécharger les données."
+msgstr "Télécharger des données"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1324,10 +1329,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 "Sauvegarder"
 
 #: ../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 "Sauvegarder les données actuelles."
@@ -1384,10 +1389,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 "Enregistrer sous…"
 
 #: ../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 "Sauvegarder les données actuelles dans un nouveau fichier."
@@ -1431,25 +1436,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 "Fermer"
 
-#: ../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 "Couper un chemin"
 
-#: ../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 "Séparer un chemin au nœud sélectionné."
 
-#: ../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 "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
 
-#: ../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."
@@ -1457,5 +1462,5 @@
 msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin."
 
-#: ../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 "
@@ -1471,9 +1476,9 @@
 "sélectionner le chemin également."
 
-#: ../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 "Les nœuds sélectionnés ne font pas partie du même chemin."
 
-#: ../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."
@@ -1481,11 +1486,11 @@
 msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
 
-#: ../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 ""
 "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
 
-#: ../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 "
@@ -1495,5 +1500,5 @@
 "sélectionner les nœuds au milieu du chemin.)"
 
-#: ../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 "
@@ -1504,5 +1509,5 @@
 "nécessaire.</html>"
 
-#: ../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 "
@@ -1512,5 +1517,5 @@
 "chemins.<br>Vous devriez vérifier cela et le corriger si nécessaire.</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"
@@ -1540,37 +1545,37 @@
 msgstr "Dupliquer les nœuds utilisés par plusieurs chemins."
 
-#: ../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 "Ce nœud n’est pas collé à quelque chose d’autre."
 
-#: ../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 "Aucun de ces nœuds ne sont collés à autre chose."
 
-#: ../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 "Aucun des nœuds de ce chemin ne sont collés à autre chose."
 
-#: ../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 "Rien ne peut être séparé dans la sélection actuelle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Sélectionner au choix :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nœud taggué, ou"
 
-#: ../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 "* Un nœud utilisé par plus d’un chemin, ou"
 
-#: ../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 "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
 
-#: ../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"
@@ -1578,10 +1583,10 @@
 "* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou"
 
-#: ../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."
 msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
 
-#: ../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"
@@ -1595,9 +1600,9 @@
 "sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nœud séparé"
 
-#: ../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"
@@ -1605,5 +1610,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"
@@ -1644,12 +1649,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Actualise les éléments du calque courant depuis le serveur."
+msgstr "Met à jour les objets dans la couche active depuis le serveur."
 
 #. 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 "Télécharger les données."
@@ -1667,5 +1671,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Actualiser les éléments sélectionnés"
 
@@ -1682,5 +1687,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
 
@@ -1688,4 +1694,9 @@
 msgid "Selection empty"
 msgstr "La sélection est vide"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Actualiser les éléments sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1695,8 +1706,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-#, fuzzy
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
-"Envoyer tout les changements dans le calque courant vers le serveur d'OSM"
+"Mettre en ligne tous les changements dans la couche active vers le serveur "
+"OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1818,5 +1829,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
+msgstr "Le nœud est encore utilisé"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
@@ -1838,30 +1849,24 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera "
-"ignoré pour compléter l'envoi."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera "
-"ignoré pour compléter l'envoi."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Changer {0} objet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Ignore l'exception car le téléchargement a été annulé. L'exception était : "
-"{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1979,9 +1984,9 @@
 msgstr "Données GPX téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Téléchargement des données"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1991,5 +1996,5 @@
 "{0}"
 
-#: ../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 "Pas de donnée trouvée dans cette zone."
@@ -2005,7 +2010,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "visible (sur le serveur)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2021,7 +2025,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Cliquer pour annuler et reprendre l'édition de la carte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2046,8 +2049,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
 msgstr ""
-"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2057,7 +2059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Erreurs durant le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2071,5 +2072,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
@@ -2103,6 +2104,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 "sélectionné"
@@ -2120,26 +2121,26 @@
 msgstr "Ajouter un nœud au chemin."
 
-#: ../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 "Connecter le chemin existant au nœud"
 
-#: ../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 "Ajouter un nœud à un chemin existant."
 
-#: ../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 "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../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 "Créer un nouveau nœud."
 
-#: ../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 "Sélectionner le nœud sous le curseur."
 
-#: ../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."
@@ -2148,49 +2149,48 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../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 "Commencer un nouveau chemin à partir du dernier nœud."
 
-#: ../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 "Continuer le chemin à partir du dernier nœud."
 
-#: ../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 "Terminer le tracé."
 
-#: ../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 "Extruder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Créer des surfaces"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Extruder un chemin"
 
-#: ../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 ""
-"Relacher le bouton de souris pour sélectionner les objets dans le rectangle."
-
-#: ../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 ""
 "Dessiner un rectangle de la taille souhaitée puis relacher le bouton de "
 "souris."
 
-#: ../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 "Relacher le bouton de souris pour arrêter la rotation."
-
-#: ../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 ""
+"Dessiner un rectangle de la taille souhaitée puis relacher le bouton de "
+"souris."
+
+#: ../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 "Déplacer un segment du chemin pour faire un rectangle."
 
@@ -2251,4 +2251,9 @@
 msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+"Relacher le bouton de souris pour sélectionner les objets dans le rectangle."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2257,4 +2262,8 @@
 "Relâcher le bouton de souris pour arrêter le déplacement. Ctrl pour "
 "fusionner avec le nœud le plus proche."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2286,69 +2295,72 @@
 "droit de la souris"
 
-#: ../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 "Recherche..."
 
-#: ../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 "Rechercher des objets."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Impossible de rechercher car il n’y a pas de données chargées."
-
-#: ../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 "Veuillez entrer une chaine de caractère comme filtre."
 
-#: ../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 "Entrer le texte à rechercher."
 
-#: ../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 "expression régulière"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: ../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 "ajouter à la sélection"
 
-#: ../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 "supprimer de la sélection"
 
-#: ../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 "trouver dans une selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "respecter la casse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../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>Baker Street</b> - 'Baker' et 'Street' dans n'importe quelle clé ou nom."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' dans n'importe quelle clé ou nom."
 
-#: ../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:Bak</b> - 'Bak'  n'importe où dans le nom."
 
-#: ../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> - clé 'type' avec la valeur exacte '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>, "
@@ -2358,17 +2370,17 @@
 "<b>*=valeur</b>, <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:Bak</b> - pas 'Bak' dans le nom."
 
-#: ../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> - key=foot avec n'importe quelle valeur."
 
-#: ../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>Options spéciales :</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>)"
@@ -2376,40 +2388,39 @@
 "<b>type:</b> - type de l'objet (<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>user:</b>... - tous les objets modifiés par l'utilisateur"
 
-#: ../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 "<b>id :</b>... - objet avec l'ID indiqué (0 pour les nouveaux objets)"
 
-#: ../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>... - objet avec le nombre de nœuds spécifié"
 
-#: ../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>... - objet avec le nombre de nœuds spécifié"
-
-#: ../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> - tous les objets modifiés"
 
-#: ../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> - tous les objets sélectionnés"
 
-#: ../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> - tous les objets incomplets"
 
-#: ../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>untagged</b> - tous les objets non étiquetés"
 
-#: ../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"
@@ -2418,5 +2429,5 @@
 "l'expression"
 
-#: ../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"
@@ -2425,18 +2436,18 @@
 "l'expression"
 
-#: ../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 "Utilisez <b>|</b> ou <b>OR</b> pour combiner avec le OU logique"
 
-#: ../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 ""
 "Utilisez <b>\"</b> pour citer des opérateurs (i.e. si la clé contient :)"
 
-#: ../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 "Utilisez <b>(</b> et <b>)</b> pour grouper des expressions"
 
-#: ../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
@@ -2446,51 +2457,51 @@
 msgstr "Filtrez"
 
-#: ../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 "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "appliquer le filtre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../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 "Aucun résultat trouvé pour \"{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 "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../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 "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../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} résultats trouvés"
 
-#: ../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"
@@ -2544,17 +2555,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations "
-"sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : "
-"10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2682,6 +2689,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
@@ -2806,5 +2813,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 ""
@@ -2827,9 +2834,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 "Le paramètre \"{0}\" ne doit pas être vide."
+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"
@@ -2865,5 +2875,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 "Séparer le segment du chemin"
@@ -2871,6 +2881,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."
@@ -2882,5 +2892,5 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Confirmation de suppression"
@@ -2891,5 +2901,15 @@
 msgstr "Résoudre les conflits de suppression dans {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"
@@ -2975,5 +2995,5 @@
 msgstr "Résoudre {0} conflits de tag pour la relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3080,8 +3100,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 "La valeur par défaut est \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3209,7 +3235,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "Envoyer le calque ''{0}'' sur le serveur ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3268,5 +3294,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
@@ -3280,5 +3306,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 ""
@@ -3287,4 +3313,43 @@
 "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 "Arguments manquants pour le -"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Historique de la relation {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive "
+"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette "
+"contradiction. Je conserve ma primitive. "
 
 #. translators notes must be in front
@@ -3341,32 +3406,33 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Erreur : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Attention : {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 "Une primitive avec un ID égal à 0 ne peut pas être invisible."
 
-#: ../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 ""
 
@@ -3391,47 +3457,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 "Il n’y a pas de primitive de version {0} dans cet historique"
-
-#: ../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 ""
-"Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
-
-#: ../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 "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "pas de version plus récente trouvée. L’historique est vide."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr "Pas de type trouvé. L'historique est vide."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données"
-
-#: ../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 ""
-"Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données"
-
-#: ../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
@@ -3442,6 +3489,7 @@
 msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
 
@@ -3453,109 +3501,109 @@
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
 
-#: ../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 "La zone n'est pas fermée."
 
-#: ../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 "Le multipolygone \"{0}\" n'est pas fermé."
 
-#: ../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 "Membre \"{0}\" supprimé de la relation."
 
-#: ../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 "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../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 "Plus d'un chemin d'origine trouvé."
 
-#: ../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 "Plus d'un chemin \"destination\" trouvé."
 
-#: ../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 "Plus d'un \"via\" trouvé."
 
-#: ../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 "Rôle inconnu \"{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 "Type de membre inconnu pour \"{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 "Pas de chemin d'origine trouvé."
 
-#: ../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 "Pas de chemin \"destination\" trouvé."
 
-#: ../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 "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../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 ""
 "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
 
-#: ../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 "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
 
-#: ../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 "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../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 "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
 
-#: ../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 "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../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 "Intersection entre les chemins \"{0}\" et \"{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 "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#: ../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 "Pas de rôle utile \"{0}\" pour le chemin \"{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 "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../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 "Pas de chemin extérieur pour le multipolygone \"{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."
@@ -3563,40 +3611,37 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../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 "Le style du chemin extérieur \"{0}\" ne concorde pas."
 
-#: ../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 "non étiqueté"
 
-#: ../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 "texte"
 
-#: ../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 "zone de texte"
 
-#. 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 ""
-"Ma primitive d’id {0} et de version {1} est visible bien que leur primitive "
-"de version plus ancienne {2} n’est pas visible. impossible de résoudre cette "
-"contradiction. Je conserve ma primitive. "
-
-#: ../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 "Erreur : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Attention : {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inactif"
 
-#: ../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
@@ -3606,5 +3651,5 @@
 msgstr[1] "nœuds"
 
-#: ../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
@@ -3614,6 +3659,6 @@
 msgstr[1] "voies"
 
-#: ../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
@@ -3623,13 +3668,13 @@
 msgstr[1] "relations"
 
-#: ../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 "chemin non étiqueté"
 
-#: ../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 "chemin incomplet"
 
-#: ../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
@@ -3637,5 +3682,5 @@
 msgstr "arrière-plan"
 
-#: ../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 "surligner"
@@ -3719,5 +3764,5 @@
 msgstr "Ne plus afficher"
 
-#: ../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
@@ -3725,32 +3770,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 "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "highway"
 
-#: ../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 "voie ferrée"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "voie navigable"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "utilisation du terrain"
 
-#: ../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"
@@ -3759,5 +3804,5 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3766,33 +3811,33 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Condition préalable non remplie"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Exception de sécurité"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Exception de réseau"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "Exception E/S"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Requête incorrecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Non trouvé"
 
-#: ../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
@@ -3800,9 +3845,9 @@
 msgstr "Conflit"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Objet effacé"
@@ -3824,7 +3869,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Fermer la boîte de dialogue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4028,5 +4072,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 "Édition"
@@ -4152,10 +4196,10 @@
 msgstr "Utilisateur :"
 
-#: ../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 "le calque n’est pas dans la liste."
 
-#: ../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"
@@ -4163,7 +4207,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Non, annuler l’opération"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4292,5 +4335,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"
@@ -4299,5 +4342,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"
@@ -4307,5 +4350,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 "Membres"
@@ -4768,5 +4811,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 "Non, annuler"
@@ -4828,6 +4871,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 "<non défini>"
@@ -4957,4 +4998,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"
@@ -5051,5 +5093,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"
@@ -5060,5 +5102,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"
@@ -5077,12 +5119,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Conserver ma version"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Supprimer ce membre de la relation de la relation."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5101,12 +5141,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Définir un rôle pour les membres sélectionnés"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Attributs issus de relations"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5122,7 +5160,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5189,5 +5226,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
@@ -5285,5 +5322,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"
@@ -5339,11 +5376,11 @@
 msgstr "Afficher l’historique de tous les articles sélectionnés."
 
-#: ../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
@@ -5351,13 +5388,13 @@
 msgstr "Recharger"
 
-#: ../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 "Recharger les objets actuellement sélectionnés et rafraîchir la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Afficher"
 
-#: ../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 "Afficher l'historique de l'élément sélectionné."
@@ -5414,7 +5451,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] "Cela modifiera {0} objet maximum."
@@ -5422,5 +5458,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 "Une valeur vide supprime la clé."
 
@@ -5445,4 +5482,11 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
+#: ../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] "Cela modifiera {0} objet maximum."
+msgstr[1] "Cela modifiera {0} objets maximum."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5520,33 +5564,33 @@
 #. 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 "Relations"
 
-#: ../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 "Ouvrir une liste de toutes les relations."
 
-#: ../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 "Relations : {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 "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../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 "Supprimer la relation sélectionnée"
 
-#: ../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 "Créer une nouvelle relation"
 
-#: ../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"
@@ -5555,27 +5599,23 @@
 "d'édition"
 
-#: ../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 "Supprimer la relation sélectionnée"
-
-#: ../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 "Sélectionner au choix :"
-
-#: ../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 "Télécharger les relations sélectionnée."
-
-#: ../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 "Télécharger les membres"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5735,5 +5775,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}"
@@ -5981,18 +6021,19 @@
 msgstr "éditer la relation en référence du membre de relation sélectionné"
 
-#: ../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 "Zoomer à"
 
-#: ../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
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
+msgstr "éditer la relation en référence du membre de relation sélectionné"
+
+#: ../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 ""
@@ -6015,5 +6056,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}"
@@ -6085,7 +6126,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6097,12 +6137,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Créer la frontière"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "éditer la relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6113,7 +6151,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 "Entrer un nom pour cet emplacement."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6123,12 +6160,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Déplacer les membres sélectionnés vers le haut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Déplacer les membres sélectionnés vers le haut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6188,7 +6223,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Séparer un chemin au nœud sélectionné."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6197,7 +6231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Le chemin sélectionné ne contient pas le nœud sélectionné"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6221,7 +6254,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Aucune relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6238,17 +6270,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Fermer cette fenêtre et annuler le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "éditer la relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Veuille sélectionnez la rangée à éditer."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6264,7 +6293,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Entrez un nom d’endroit à rechercher :"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6279,12 +6307,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Recherche..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Direction vers laquelle chercher de la terre"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7214,7 +7240,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "à côté de"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7259,5 +7284,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 ""
@@ -7271,5 +7296,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 ""
@@ -7280,5 +7305,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 ""
@@ -7287,19 +7312,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 ""
@@ -7309,32 +7334,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 ""
@@ -7356,32 +7381,32 @@
 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 "Historique du nœud {0}"
 
-#: ../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 "Historique du chemin {0}"
 
-#: ../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 "Historique de la relation {0}"
 
-#: ../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 "Fermer la boîte de dialogue"
 
-#: ../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 ""
@@ -7389,6 +7414,6 @@
 "primitive."
 
-#: ../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 ""
@@ -7396,5 +7421,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 ""
@@ -7404,5 +7429,5 @@
 "pas disponible dans l’historique"
 
-#: ../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 ""
@@ -7410,5 +7435,5 @@
 "courante."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7419,24 +7444,34 @@
 "disponible dans l’historique"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Chargement de l'historique"
 
-#: ../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 "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#: ../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}"
@@ -7449,4 +7484,22 @@
 msgstr "Nœud {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoomer sur le problème"
+
+#: ../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 "Chargement de l'historique"
+
+#: ../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
@@ -7459,17 +7512,69 @@
 msgstr "Relation {0}"
 
-#: ../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 "Trier le menu des balises"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../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 "inconnu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Cliquer <strong>{0}</strong> pour commencer la fusion de leurs "
+"éléments avec les miens</html>"
+
+#: ../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 "Anonyme"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7495,4 +7600,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} créée le {1} par {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "supprimé"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Version {0} créée le {1} par {2}"
 
@@ -7852,9 +7972,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] "{0} objet à modifier :"
-msgstr[1] "{0} objets à modifier :"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7939,13 +8059,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 "Charger la liste de vos ensembles de changements depuis le serveur"
 
-#: ../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 "Fermer l'ensemble de changements actuellement ouvert"
 
-#: ../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
@@ -8014,5 +8134,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}..."
@@ -8024,5 +8144,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 "Images géolocalisées"
@@ -8048,5 +8168,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"
@@ -8101,43 +8221,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 "point GPS"
 
 #: ../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 "Personnaliser le dessin des lignes"
 
 #: ../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 "Utiliser les réglages généraux."
 
 #: ../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 "Dessiner des lignes entre les points pour ce calque."
 
 #: ../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 "Ne pas dessiner de ligne entre les points pour ce calque."
 
 #: ../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 "Sélectionner les options de dessin des lignes"
 
 #: ../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 "Personnaliser la couleur"
 
 #: ../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"
@@ -8145,6 +8265,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"
@@ -8234,10 +8354,10 @@
 msgstr[1] "{0} chemins"
 
-#: ../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 "Convertir en calque de données"
 
-#: ../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."
@@ -8248,43 +8368,43 @@
 "regardez ici :"
 
-#: ../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 "Converti depuis: {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 "Télécharger depuis OSM le long de cette trace"
 
-#: ../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 "Tout télécharger dans un rayon de :"
 
-#: ../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} mètres"
 
-#: ../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 "Aire maximale par requête:"
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8295,5 +8415,5 @@
 "Voulez-vous<br>continuer ?</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 ""
@@ -8301,5 +8421,5 @@
 "audio."
 
-#: ../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 "
@@ -8309,5 +8429,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../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 "
@@ -8368,37 +8488,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Fermer cette fenêtre et annuler le téléchargement"
-
-#: ../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} supprimés)"
-msgstr[1] " ({0} supprimés)"
-
-#: ../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} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "non défini"
 
-#: ../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 "Version de l’API : {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 "Convertir en calque GPX"
 
-#: ../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."
@@ -8406,5 +8525,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"
@@ -8413,5 +8532,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"
@@ -8419,5 +8538,5 @@
 msgstr[1] "points"
 
-#: ../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"
@@ -8426,5 +8545,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../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"
@@ -8433,5 +8552,5 @@
 msgstr[1] "{0} est constitué de {1} traces"
 
-#: ../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"
@@ -8440,9 +8559,9 @@
 msgstr[1] "{0} points"
 
-#: ../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 "marqueur gps"
 
-#: ../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"
@@ -8450,5 +8569,5 @@
 msgstr[1] "marqueurs"
 
-#: ../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"
@@ -8457,9 +8576,9 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../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 "Synchronizer l’audio"
 
-#: ../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."
@@ -8468,5 +8587,5 @@
 "de synchronisation."
 
-#: ../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
@@ -8474,14 +8593,14 @@
 msgstr "Fichier audio synchronisé au point {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 "Impossible de synchroniser dans le calque actuellemnt lu."
 
-#: ../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 "Créer un marqueur audio au niveau de la tête de lecture"
 
-#: ../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 "
@@ -8491,5 +8610,5 @@
 "voulez le marqueur."
 
-#: ../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 ""
@@ -8497,9 +8616,9 @@
 "décalage ."
 
-#: ../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 "Afficher/Masquer Texte/Icônes"
 
-#: ../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 "Bascule l'état de visibilté du marqueur de texte et d'icônes."
@@ -8569,5 +8688,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 "Veuille sélectionnez la rangée à éditer."
@@ -8581,5 +8700,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."
@@ -9298,7 +9417,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Activer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9341,17 +9459,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9361,39 +9476,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "AJouter un nouvel attribut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Fermer les ensembles de changements sélectionnés"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Modifier la source sélectionnée."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Envoi des données pour le calque ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Impossible de charger l’historique depuis le serveur. Détails :<br>{0}"
-"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr ""
-"format inattendu de nouvelle version d’une primitive modifiée \"{0}\", reçu "
-"\"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -10027,5 +10135,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}''."
@@ -10052,5 +10160,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}."
@@ -10058,5 +10166,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}"
@@ -10069,5 +10177,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}''."
@@ -10233,5 +10341,5 @@
 msgstr "Le fichier \"{0}\" n'existe pas"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10240,38 +10348,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 ""
@@ -10279,19 +10387,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 "Champ <member> incomplet avec 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 "L’objet avec l’id=0 est illégal"
 
-#: ../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 ""
@@ -10302,9 +10410,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 ""
@@ -10314,25 +10422,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 ""
@@ -10340,5 +10448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10347,5 +10455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10353,5 +10461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10360,13 +10468,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 "Préparation des données de OSM..."
 
-#: ../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 ""
@@ -10518,9 +10626,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} greffon téléchargé avec succès. Veuillez redémarrer JOSM."
-msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10582,7 +10690,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Mise à jour des greffons"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10727,35 +10834,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 "inconnu"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11402,47 +11478,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 "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../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 "Début du parcours du dossier"
 
-#: ../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 "Un des fichiers sélectionnés était vide !!!"
-
-#: ../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 "Lexture des images..."
 
-#: ../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 "Impossible d’obtenir le chemin canonique du dossier {0}\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 "Parcours du dossier {0}"
 
-#: ../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 "Fichier vide trouvé dans le dossier {0}\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 "Erreur lors de la récupération des fichiers du dossier {0}\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 "Corréler en GPX"
 
-#: ../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."
@@ -11458,24 +11533,24 @@
 msgstr "Charger l'ensemble des images comme un nouveau calque."
 
-#: ../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 "Fichiers GPX (*.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 "Le fichier {0} est maintenant chargé sous le nom \"{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 "Erreur pendant le traitement {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 "Impossible de lire \"{0}\""
 
-#: ../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."
@@ -11487,34 +11562,34 @@
 "hpoto et sélectionnez un fuseau horaire.<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 "Heure de la photo (information 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 "Heure du GPS (lu sur la photo) : "
 
-#: ../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 " [jj/mm/aaa 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 "Je suis dans le fuseau horaire de : "
 
-#: ../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 "Aucune date"
 
-#: ../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 "Ouvrez une autre photo"
 
-#: ../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 "Synchroniser l’heure avec une photo du GPS"
 
-#: ../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"
@@ -11524,29 +11599,29 @@
 "Merci d’utiliser le format demandé"
 
-#: ../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 "Date non valide"
 
-#: ../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 "<Aucune trace GPX encore chargée>"
 
-#: ../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 "Trace GPX : "
 
-#: ../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 "Ouvrir une autre trace GPX"
 
-#: ../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 "Fuseau horaire : "
 
-#: ../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 "Décallage :"
 
-#: ../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 ""
@@ -11554,41 +11629,41 @@
 "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 "Mettre à jour la position pour : "
 
-#: ../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 "Toutes les images"
 
-#: ../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 "Images sans position EXIF"
 
-#: ../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 "Images non encore étiquetées"
 
-#: ../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 "Correler les images avec la trace GPX"
 
-#: ../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 "Corréler"
 
-#: ../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 "Estimation automatique"
 
-#: ../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 "Vous devez sélectionner une trace GPX"
 
-#: ../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 "Aucune trace GPX sélectionnée"
 
-#: ../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 ""
@@ -11599,9 +11674,9 @@
 "Format attendu : {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 "Fuseau horaire invalide"
 
-#: ../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 ""
@@ -11612,27 +11687,27 @@
 "Format attendu : {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 "Décallage invalide"
 
-#: ../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 "Trouvé {0} correspondances sur {1} dans la trace GPX {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 "Trace GPX chargée"
 
-#: ../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 ""
 "Les photos sélectionnées ne contiennent pas d'information d'horodatage."
 
-#: ../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 "Les photos ne contienne tpas d'information d'horodatage"
 
-#: ../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."
@@ -11641,39 +11716,39 @@
 "autre."
 
-#: ../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 "La trace GPX n'a pas d'horodatage."
 
-#: ../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 "Fuseau horaire : {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 "Minutes : {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 "Secondes : {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} photo(s) sur {1} correspond(ent) à la trace GPX."
 
-#: ../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 "(Différence de temps de {0} jours)"
 
-#: ../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 "Différence entre la trace et les photos : {0}min. {1}sec."
 
-#: ../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 "
@@ -11684,13 +11759,13 @@
 "manuellement."
 
-#: ../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 "La correspondance des photos avec la trace a échoué"
 
-#: ../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 "Ajuster le fuseau horaire et le décalage"
 
-#: ../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 "Valeurs par défaut"
@@ -11711,5 +11786,5 @@
 msgstr "Erreur sur le fichier {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11725,37 +11800,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 "Sélectionner la feuille cadastrale."
 
-#: ../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 "Erreur lors du chargement du fichier"
 
-#: ../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 "Fichier tampon de la zone Lambert 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 "Fichier tampon de la zone Lambert 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 "Fichier tampon de la zone Lambert 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 "Fichier tampon de la zone Lambert 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 : url illégale."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11769,18 +11844,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 "Sélectionner la commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Choisir parmi..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
@@ -11814,34 +11889,34 @@
 "plan. L'exception était : {0}"
 
-#: ../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 "Remplacer le fond original par la couleur de fond de 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 "Inverser les couleurs grises (pour les fonds noir)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Rendre le fond transparent."
 
-#: ../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 "Tracer les limites des données téléchargées."
 
-#: ../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 "Activer le tampon automatique."
 
-#: ../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 "Taille max. du tampon (en 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."
@@ -11858,9 +11933,9 @@
 "<BR>avant tout chargement de données créé à partir de ce greffon."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS du cadastre français"
 
-#: ../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 ""
@@ -11868,10 +11943,10 @@
 "celle-ci est activé</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Source"
 
-#: ../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 "
@@ -11881,5 +11956,5 @@
 "préférences de JOSM."
 
-#: ../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). "
@@ -11889,9 +11964,9 @@
 "intermédiaires). Utile pour lire les textes sur fond noir."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Permet l'empilement de plusieurs calques"
 
-#: ../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 ""
@@ -11899,5 +11974,5 @@
 "gauche."
 
-#: ../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 ""
@@ -11905,10 +11980,10 @@
 
 #. 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 ""
@@ -11916,22 +11991,22 @@
 "mémoire)"
 
-#: ../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 "Carré de taille fixe (par défaut  : 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 "Taille fixe (de 25 à 1000 mètres)"
 
-#: ../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 ""
@@ -11939,31 +12014,31 @@
 "taille est dépassée"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Ajouter le commentaire de source suivant :"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Ajouter \"source=...\" aux éléments ?"
 
-#: ../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 "Téléchargement {0}"
 
-#: ../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 "Contact du serveur WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Créer les bâtiments"
 
-#: ../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"
@@ -11973,30 +12048,30 @@
 "l'import des bâtiments est limité à 1km2 max."
 
-#: ../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 "Veuillez activer l'auto-sourcing et vérifier le millésime du cadastre."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "Extraire le ViewBox du SVG"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Extraction des meilleures limites..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Créer la frontière"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Contact du serveur WMS du cadastre…"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr "L'image a déjà été chargée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -12004,29 +12079,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 "Extraire les limites de commune"
 
-#: ../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 "Seulement sur les calques vectorisés"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Extraire les empreintes des bâtiments"
 
-#: ../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 "Téléchargement depuis le serveur WMS du Cadastre français"
 
-#: ../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"
@@ -12038,13 +12113,13 @@
 "et réessayez"
 
-#: ../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 "Géoréférencement interrompu."
 
-#: ../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"
@@ -12052,5 +12127,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"
@@ -12058,14 +12133,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"
@@ -12073,14 +12148,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"
@@ -12088,65 +12163,65 @@
 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 "Entrez la position est,nord du cadastre."
 
-#: ../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 "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Nord"
 
-#: ../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 "Zone Lambert"
 
-#: ../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 ""
 "Télécharger la zone depuis le tampon (seulement si le tampon est activé)"
 
-#: ../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 "Changer de lieu"
 
-#: ../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 "Définir un nouveau lieu pour la prochaine requête"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Ajouter un nouveau calque"
 
-#: ../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 "Localisation"
 
-#: ../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 "
@@ -12156,25 +12231,25 @@
 "ponctuation disponible sur 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 "Ajouter un nouveau calque"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Réinitialisation du cookie"
 
-#: ../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 "Obtenir un nouveaucooki (session espirée)"
 
-#: ../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
@@ -12184,14 +12259,14 @@
 msgstr[1] "Simplifier le chemin (supprimer {0} nœuds)"
 
-#: ../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 "Ajuster WMS"
 
-#: ../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 "Ajuster la position de la couche WMS (images raster uniquement)"
 
-#: ../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"
@@ -12199,5 +12274,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
@@ -12205,5 +12280,5 @@
 msgstr "Télécharger la tuile WMS depuis {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"
@@ -12213,34 +12288,34 @@
 "Sélectionnez en une dans la liste, puis réessayez"
 
-#: ../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 "Calque vide"
 
-#: ../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 "Calque WMS ({0}), {1} tuile(s) chargée(s)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "N'est pas vectorisée."
 
-#: ../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 "Est vectorisée."
 
-#: ../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 "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12251,9 +12326,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../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}"
@@ -12262,9 +12337,9 @@
 "courante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de tampon de zone Lambert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12374,9 +12449,9 @@
 msgstr "Créer un chemin dupliqué"
 
-#: ../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 "Couche d'édition des traces GPX"
 
-#: ../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 "Convertir en couche GPX en rendant anonyme l'horodatage"
@@ -12393,11 +12468,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 "Importer un chemin depuis le calque GPX"
 
 #: ../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 "Abandonner le chemin existant"
@@ -12407,5 +12482,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 "Pas de calque de données GPX trouvé."
@@ -12621,5 +12696,5 @@
 msgstr "Afficher des photos non géotaggués"
 
-#: ../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 "Images importées"
@@ -13060,5 +13135,5 @@
 msgstr "Angle entre deux nœuds sélectionnés"
 
-#: ../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 "Calque où faire des mesures"
@@ -13137,5 +13212,5 @@
 msgstr "Boucle de téléchargement 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 "Afficher les problèmes d'OpenStreetBugs"
@@ -13282,7 +13357,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Calque"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13452,43 +13526,41 @@
 msgstr "Entrez les valeurs du poids"
 
-#: ../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 "Carte glissante"
 
-#: ../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 "Zoom automatique : "
-
-#: ../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 "Charger la tuile"
 
-#: ../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 "Afficher les informations"
-
-#: ../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 "Charger toutes les dalles"
 
-#: ../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 "Augmenter le zoom"
 
-#: ../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 "Diminuer le zoom"
 
-#: ../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 "Réinitialiser la mémoire tampon des tuiles"
 
-#: ../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 "image "
@@ -13524,7 +13596,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Niveau de zoom maxi. : "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13885,6 +13956,6 @@
 msgstr "Êtes-vous sur ?"
 
-#: ../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
@@ -13892,5 +13963,5 @@
 msgstr "Erreurs de validation"
 
-#: ../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 "Aucune erreur de validation"
@@ -13983,5 +14054,5 @@
 msgstr "validation autre"
 
-#: ../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}"
@@ -14081,7 +14152,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Littoral non connecté"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -14113,19 +14183,19 @@
 msgstr "Chemins se croisant"
 
-#: ../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 "Nœuds dupliqués"
 
-#: ../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 ""
 "Ce test vérifie si des nœuds ne sont pas exactement à la même position."
 
-#: ../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 "Nœuds à la même position"
 
-#: ../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 "Confirmation"
@@ -14288,43 +14358,43 @@
 #. 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 "Problème de rendu"
 
-#: ../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 "Clé \"{0}\" non valide."
 
-#: ../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 "Étiquettes avec des valeurs vides"
 
-#: ../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 "Clé de propriété invalide"
 
-#: ../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 "espace blanc dans une clé non valide"
 
-#: ../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 "Les valeurs commencent ou finissent par un espace blanc"
 
-#: ../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 "Les valeurs contiennent du code HTML"
 
-#: ../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 "La clé \"{0}\" ne fait pas partie des balises prédéfinies."
 
-#: ../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 "Les balises ne contiennent pas de propriété"
 
-#: ../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."
@@ -14332,39 +14402,39 @@
 "La valeur \"{0}\" pour la clé \"{1}\" n'est pas dans les balises prédéfinies."
 
-#: ../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 "Les balises ne contiennent pas de valeur de propriété"
 
-#: ../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 "FIXMES"
 
-#: ../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 "Vérifier les clés de propriétés."
 
-#: ../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 ""
 "Valider que les clés sont valides en comparasion avec une liste de mots?"
 
-#: ../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 "Utiliser un vérificateur de propriétés complexe."
 
-#: ../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 ""
 "Valider les étiquettes et les valeurs en utilisant des règles complexes."
 
-#: ../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 "Source de TagChecker"
 
-#: ../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."
@@ -14375,25 +14445,25 @@
 "données de vérification des étiquettes."
 
-#: ../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 "Ajouter une nouvelle source à la liste."
 
-#: ../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 "Modifier la source sélectionnée."
 
-#: ../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 "Supprimer la source sélectionnée de la liste."
 
-#: ../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 "Sources de données"
 
-#: ../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 "Vérifier les valeurs des propriétés"
 
-#: ../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 ""
@@ -14401,9 +14471,9 @@
 "prédéfinies."
 
-#: ../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 "Vérifier les FIXMES."
 
-#: ../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 ""
@@ -14411,54 +14481,54 @@
 "lequel attribut."
 
-#: ../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 "Vérifier les notes de rendu."
 
-#: ../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 "Vérifier si le rendu de carte a généré des erreurs."
 
-#: ../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 "Utiliser le fichier de données par défaut."
 
-#: ../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 "Utiliser le fichier de données par défaut (recommandé)."
 
-#: ../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 "Utiliser la vérification orthographique par défaut."
 
-#: ../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 "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
-#: ../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 "Corriger les propriétés"
 
-#: ../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 "Impossible de trouver le type element"
 
-#: ../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 "Impossible de trouver le niveau d’avertissement"
 
-#: ../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 "Expression interdite \"{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}''"
@@ -14634,17 +14704,17 @@
 "Ce test vérifie si un chemin a son dernier point très près d’un autre chemin."
 
-#: ../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 "Fin d’un chemin près d’une autre route"
 
-#: ../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 "Fin d’un chemin près d’une autre chemin"
 
-#: ../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 "Nœud d’un chemin à côté d’un autre chemin"
 
-#: ../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 "point final d’un chemin connecté à côté d’un autre chemin"
@@ -14698,14 +14768,14 @@
 "ou des lignes de côte."
 
-#: ../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 ""
 "Ligne de côte inversée : la terre n’est pas sur le coté gauche du chemin"
 
-#: ../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 "Eau inversée : la terre n’est pas sur le coté gauche du chemin"
 
-#: ../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 "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
@@ -14745,7 +14815,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 "Calque WMS ({0}), téléchargement au zoom {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14753,85 +14823,67 @@
 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 "Sélectionner le nœud de départ à la fin d'un chemin"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Fin de la ligne atteinte"
-
-#. 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"
-msgstr "Intersection atteinte"
+#: ../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 "Téléchargement"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Télécharger des données depuis le serveur OSM."
+
+#: ../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>Il n’y a pas de calque vers lequel <br>\"{0}\"</br> le calque source "
+"puisse être fusionné.</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 "Suppression des nœuds en doublon..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Une exception s’est produite"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "aide"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Aide / À propos"
-
-#: ../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 ""
-"Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet des "
-"préférences de WMSplugin - ces options s’afficheront dans le menu WMS.\n"
-"\n"
-"Vous pouvez également effectuer ceci dans les Préférences Avancées, en "
-"utilisant le schéma suivant :\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"
-"Exemple d’URL WMS complète (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/"
-"rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n"
-"Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez "
-"manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de "
-"votre image :\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 : veuillez vous assurer que l'image est utilisable, notamment au niveau "
-"du copyright, dans le doute, ne l'utilisez pas."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Aide sur le greffon WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14941,9 +14993,9 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../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}''"
@@ -14951,19 +15003,19 @@
 "Attention : couche WMS désactivée à cause d’une adresse malformée « {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../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 "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../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 "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14974,13 +15026,13 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../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"
@@ -14989,37 +15041,37 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../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}"
@@ -15028,5 +15080,5 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
@@ -15227,5 +15279,5 @@
 #: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
-msgstr "Visualiser les informations de routage comme un claque de routage."
+msgstr "Visualiser les informations de routage comme un calque de routage."
 
 #. Plugin grid
@@ -19504,14 +19556,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Site archéologique"
+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 "Éditer un site archéologique"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27401,5 +27451,5 @@
 #: build/trans_validator.java:79
 msgid "unusual tag combination"
-msgstr "combinaison d’attributs inhabituelle"
+msgstr "combinaison inhabituelle d'attributs"
 
 #. FORMAT
@@ -27480,71 +27530,285 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Impossible de rechercher car il n’y a pas de données chargées."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Il n’y a pas de primitive de version {0} dans cet historique"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr ""
+#~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "pas de version plus récente trouvée. L’historique est vide."
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "Pas de type trouvé. L'historique est vide."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Fin de la ligne atteinte"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Intersection atteinte"
+
+#~ msgid "help"
+#~ msgstr "aide"
+
+#~ msgid "Help / About"
+#~ msgstr "Aide / À propos"
+
+#~ 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 ""
+#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet "
+#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu "
+#~ "WMS.\n"
+#~ "\n"
+#~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en "
+#~ "utilisant le schéma suivant :\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"
+#~ "Exemple d’URL WMS complète (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/"
+#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n"
+#~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez "
+#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de "
+#~ "votre image :\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 : veuillez vous assurer que l'image est utilisable, notamment au "
+#~ "niveau du copyright, dans le doute, ne l'utilisez pas."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Aide sur le greffon WMS"
+
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "No data imported."
+#~ msgstr "Aucune donnée importée"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Sélectionner un marque-page en premier."
+
 #~ msgid "File could not be found."
 #~ msgstr "Impossible de trouver le fichier."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Veuillez sélectionner au moins une tâche à télécharger"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "L’envoi vers l’API OSM a échoué"
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extension de fichier inconnue."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Object"
+#~ msgstr "Objet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objet est conflictuel :"
+#~ msgstr[1] "{0} objets sont conflictuels :"
+
+#~ msgid "my version:"
+#~ msgstr "ma version :"
+
+#~ msgid "their version:"
+#~ msgstr "version du serveur :"
+
+#~ msgid "resolved version:"
+#~ msgstr "version choisie :"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contact du serveur OSM..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Version inconnue"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "différent"
+
+#~ msgid "true"
+#~ msgstr "vrai"
+
+#~ msgid "false"
+#~ msgstr "faux"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Résoudre {0} conflits dans {1} objets"
+
+#~ msgid "Change"
+#~ msgstr "Changer"
+
+#~ msgid "unnamed"
+#~ msgstr "sans-nom"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Erreur durant le chargement de la page {0}"
+
+#~ msgid "Validate"
+#~ msgstr "Valider"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
+#~ "avez obtenu JOSM."
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupé par"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Impossible de se connecter au serveur."
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Aide en ligne de JOSM"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr ""
+#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Montrer le status de la dalle"
+
+#~ msgid "requested: {0}"
+#~ msgstr "demandé : {0}"
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Metacarta Map Rectifier image id"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "rectifier id={0}"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO·(GNOME)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO·(GNOME·Fix)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO·(WebKit)"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> n’a pas de ref"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
+#~ "données sur le serveur."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Erreur d’analyse"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
+#~ "JOSM"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
+#~ "Voulez-vous encore les fusionner ?"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr ""
+#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
+
+#~ msgid "name"
+#~ msgstr "nom"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} Greffon mis à jour avec succès. Veuillez redémarrer JOSM."
+#~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Impossible de télécharger le greffon : {0} de {1}"
+
+#~ msgid "File not found"
+#~ msgstr "Fichier non trouvé"
+
+#~ msgid "Rotate"
+#~ msgstr "Pivoter"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Supprimer {1} {0}"
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Relation conflictuelle"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
-#~ "rôle {2}.<br>Enlever de la relation ?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
-#~ "<br>Enlever de la relation ?</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erreur d’analyse"
-
-#~ msgid "File not found"
-#~ msgstr "Fichier non trouvé"
-
-#~ msgid "Replace"
-#~ msgstr "Remplacer"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Veuillez d’abord saisir les coordonnées désirées."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Sélectionner un marque-page en premier."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Veuillez saisir une chaîne de caractères pour la recherche"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr ""
-#~ "Impossible de lire les résultats de recherche du lieu depuis le serveur"
-
-#~ msgid "name"
-#~ msgstr "nom"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copier les valeurs par défaut"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Veuillez sélectionner la colonne à copier"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Ajouter une nouvelle source XML à la liste"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr ""
-#~ "Paramètres par défaut (voir info-bulle pour obtenir des informations "
-#~ "détaillées)"
 
 #~ msgid ""
@@ -27556,201 +27820,39 @@
 #~ "warntime'.)"
 
-#~ msgid "Show Tile Status"
-#~ msgstr "Montrer le status de la dalle"
+#~ msgid "Error parsing server response."
+#~ msgstr "Erreur d'analyse de la réponse du serveur"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Certains points sont (presque) sur la ligne"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Veuillez sélectionner au moins une tâche à télécharger"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Marquer ce problème comme \"fait\"?"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importer un fichier TCX comme une trace GPS"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importer un fichier TCX..."
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "error requesting update"
+#~ msgstr "Error lors de la mise à jour"
+
+#~ msgid "error loading metadata"
+#~ msgstr "Erreur lors du chargement des metadata"
 
 #~ msgid "Request Update"
 #~ msgstr "Demander une mise à jour"
 
-#~ msgid "error loading metadata"
-#~ msgstr "Erreur lors du chargement des metadata"
-
-#~ msgid "requested: {0}"
-#~ msgstr "demandé : {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "Error lors de la mise à jour"
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "No data imported."
-#~ msgstr "Aucune donnée importée"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Object"
-#~ msgstr "Objet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objet est conflictuel :"
-#~ msgstr[1] "{0} objets sont conflictuels :"
-
-#~ msgid "my version:"
-#~ msgstr "ma version :"
-
-#~ msgid "their version:"
-#~ msgstr "version du serveur :"
-
-#~ msgid "resolved version:"
-#~ msgstr "version choisie :"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contact du serveur OSM..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Version inconnue"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "différent"
-
-#~ msgid "true"
-#~ msgstr "vrai"
-
-#~ msgid "false"
-#~ msgstr "faux"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Résoudre {0} conflits dans {1} objets"
-
-#~ msgid "Change"
-#~ msgstr "Changer"
-
-#~ msgid "unnamed"
-#~ msgstr "sans-nom"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erreur durant le chargement de la page {0}"
-
-#~ msgid "Validate"
-#~ msgstr "Valider"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
-#~ "avez obtenu JOSM."
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupé par"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossible de se connecter au serveur."
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Aide en ligne de JOSM"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr ""
-#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO·(GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO·(GNOME·Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO·(WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> n’a pas de ref"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
-#~ "données sur le serveur."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
-#~ "JOSM"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
-#~ "Voulez-vous encore les fusionner ?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr ""
-#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Greffon mis à jour avec succès. Veuillez redémarrer JOSM."
-#~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossible de télécharger le greffon : {0} de {1}"
-
-#~ msgid "Rotate"
-#~ msgstr "Pivoter"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Supprimer {1} {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erreur d'analyse de la réponse du serveur"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Certains points sont (presque) sur la ligne"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Marquer ce problème comme \"fait\"?"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importer un fichier TCX comme une trace GPS"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importer un fichier TCX..."
-
 #~ msgid "Copy Default"
 #~ msgstr "Copier défaut"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Veuillez sélectionner la colonne à copier"
 
 #~ msgid "Station"
@@ -28039,4 +28141,11 @@
 #~ msgstr "Modifications non enregistrées"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Veuillez saisir une chaîne de caractères pour la recherche"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr ""
+#~ "Impossible de lire les résultats de recherche du lieu depuis le serveur"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -28322,4 +28431,7 @@
 #~ msgstr "Conflit détecté"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "L’envoi vers l’API OSM a échoué"
+
 #~ msgid "Primitive already deleted"
 #~ msgstr "Primitive déjà supprimée"
@@ -28383,6 +28495,17 @@
 #~ msgstr "supprimer le membre de la relation {0} {1}"
 
+#~ msgid "Copy defaults"
+#~ msgstr "Copier les valeurs par défaut"
+
 #~ msgid "Download referrers..."
 #~ msgstr "Téléchargement des référents..."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr ""
+#~ "Paramètres par défaut (voir info-bulle pour obtenir des informations "
+#~ "détaillées)"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Ajouter une nouvelle source XML à la liste"
 
 #~ msgid "Download referrers from OSM..."
@@ -28424,4 +28547,18 @@
 
 #~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
+#~ "<br>Enlever de la relation ?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
+#~ "rôle {2}.<br>Enlever de la relation ?</html>"
+
+#~ msgid ""
 #~ "Select to upload to the existing changeset {0} and to leave the changeset "
 #~ "open for further uploads"
@@ -28452,4 +28589,7 @@
 #~ msgstr "Pas encore décidé."
 
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
@@ -28506,2 +28646,5 @@
 #~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int "
 #~ "(>=0), reçu \"{1}\""
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Veuillez d’abord saisir les coordonnées désirées."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 18508)
+++ applications/editors/josm/i18n/po/gl.po	(revision 18656)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
 "PO-Revision-Date: 2009-09-22 15:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:23+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 "Erro"
@@ -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"
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -455,5 +456,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
@@ -495,5 +496,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
@@ -502,6 +503,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"
@@ -687,5 +689,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
@@ -698,5 +700,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"
@@ -769,5 +771,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
@@ -775,28 +785,28 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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}"
@@ -833,10 +843,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 "Exportar a 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 "Exportar os datos a un ficheiro GPX."
@@ -849,11 +859,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
@@ -884,5 +893,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
@@ -897,17 +905,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
@@ -967,5 +976,5 @@
 msgstr "Unir un nodo ós segmentos de vía máis próximos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Unir Nodo e Liña"
@@ -996,22 +1005,19 @@
 msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Abortando..."
-
-#: ../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 ""
-"Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en "
-"uso."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1152,7 +1158,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Descargando datos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1301,10 +1306,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 "Gardar"
 
 #: ../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 "Gardar os datos actuais."
@@ -1361,10 +1366,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 "Gardar como..."
 
 #: ../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 "Gardar os datos actuais nun novo ficheiro."
@@ -1408,25 +1413,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 "Pechar"
 
-#: ../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 "Separar Vía"
 
-#: ../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 "Separar unha vía no nodo seleccionado."
 
-#: ../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 "A selección actual non pode ser usada para a separación."
 
-#: ../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."
@@ -1434,5 +1439,5 @@
 msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía."
 
-#: ../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 "
@@ -1448,9 +1453,9 @@
 "selecciona tamén a vía."
 
-#: ../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 "Os nodos seleccionados non comparten a mesma vía."
 
-#: ../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."
@@ -1458,10 +1463,10 @@
 msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
 
-#: ../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 "Debes seleccionar dous ou máis nodos para separar unha vía circular."
 
-#: ../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 "
@@ -1471,5 +1476,5 @@
 "nodos no medio da vía.)"
 
-#: ../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 "
@@ -1477,5 +1482,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 "
@@ -1483,5 +1488,5 @@
 msgstr ""
 
-#: ../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"
@@ -1511,38 +1516,38 @@
 msgstr "Duplicar nodos que son usados por múltiples vías."
 
-#: ../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 "Este nodo non está pegado a outra cousa."
 
-#: ../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 "Ningún destes nodos estan pegados a outra cousa."
 
-#: ../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 "Ningún dos nodos desta vía están pegados a outra cousa."
 
-#: ../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 "A selección actual non pode ser usada para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Seleccionar ou ben:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, ou"
 
-#: ../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 "* Un nodo que está sendo usado por máis dunha vía, ou"
 
-#: ../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 ""
 "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
 
-#: ../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"
@@ -1551,5 +1556,5 @@
 "vía, ou"
 
-#: ../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."
@@ -1558,5 +1563,5 @@
 "vía."
 
-#: ../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"
@@ -1569,9 +1574,9 @@
 "obterán as súas propias copias e todos os nodos serán seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Despegar Nodo"
 
-#: ../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"
@@ -1579,5 +1584,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"
@@ -1618,12 +1623,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Debuxar os límites dos datos cargados dende o servidor."
+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 ""
@@ -1639,6 +1643,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Actualizar Selección"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1652,5 +1657,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Non hai primitivas seleccionadas para actualizar."
 
@@ -1658,4 +1664,9 @@
 msgid "Selection empty"
 msgstr "Selección valeira"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Actualizar Selección"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1813,7 +1824,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Cambiar {0} obxecto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1935,9 +1946,9 @@
 msgstr "Datos GPX Descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1945,5 +1956,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 ""
@@ -1959,7 +1970,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Nome do usuario"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1993,7 +2003,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2003,7 +2013,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Erros durante a descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2017,5 +2026,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
@@ -2048,6 +2057,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 "seleccionado"
@@ -2065,26 +2074,26 @@
 msgstr "Engadir nodo na vía"
 
-#: ../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 "Conectar via existente a nodo"
 
-#: ../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 "Engadir un novo nodo a unha via existente"
 
-#: ../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 "Engadir nodo a vía e conectar"
 
-#: ../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 "Crear novo nodo."
 
-#: ../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 "Seleccionar nodo baixo o 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."
@@ -2093,47 +2102,46 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../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 "Comezar nova vía a partir do último nodo."
 
-#: ../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 "Continuar vía a partir do último nodo."
 
-#: ../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 "Rematar debuxo."
 
-#: ../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 "Extrudir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Crear áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Extrudir Vía"
 
-#: ../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 "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato."
 
-#: ../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 "Soltar o botón do rato para deter a rotación."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Arrastrar un segmento de vía para crear un rectángulo."
 
@@ -2190,4 +2198,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2196,4 +2208,8 @@
 "Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis "
 "próximo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Soltar o botón do rato para deter a rotación."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2223,67 +2239,70 @@
 "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
 
-#: ../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 "Buscar..."
 
-#: ../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 "Buscar obxectos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Por favor, introduce unha cadea de busca."
 
-#: ../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 "expresión regular"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../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 "engadir á selección"
 
-#: ../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 "eliminar da selección"
 
-#: ../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 "sensible a maiúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../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>Baker Street</b> - 'Baker' e 'Street' en calquer clave ou nome."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' en calquera clave ou nome."
 
-#: ../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:Bak</b> - 'Bak' en calquer posición do nome."
 
-#: ../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> - a clave 'type' co valor exacto '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,57 +2312,56 @@
 "b>, <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:Bak</b> - que non conteña 'Bak' no nome."
 
-#: ../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> - clave=foot establecida con calquer valor."
 
-#: ../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>Obxectivos especiais:</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> - tipo do obxecto(<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>user:</b>... - todos os obxectos cambiados polo usuario"
 
-#: ../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>... - obxectro có número de nodos indicado"
 
-#: ../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>... - obxectro có número de nodos indicado"
-
-#: ../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> - todos os obxectos cambiados"
 
-#: ../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> - todos os obxectos seleccionados"
 
-#: ../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> - todos os obxectos incompletos"
 
-#: ../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>untagged</b> - todos os obxectos sen etiquetar"
 
-#: ../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"
@@ -2352,5 +2370,5 @@
 "coa expresión"
 
-#: ../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"
@@ -2359,17 +2377,17 @@
 "expresión"
 
-#: ../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 "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
 
-#: ../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 "Usar <b>\"</b> para escapar operadores (p.e. se a clave conten : )"
 
-#: ../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 "Usar <b>(</b> e <b>)</b> para agrupar expresións"
 
-#: ../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
@@ -2379,51 +2397,51 @@
 msgstr ""
 
-#: ../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 "Buscar"
 
-#: ../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 "Comezar Busca"
 
-#: ../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 "Non se atoparon coincidencias para \"{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 "Non se engadiu nada á selección buscando por \"{0}\""
 
-#: ../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 "Non se eliminou da selección buscando por \"{0}\""
 
-#: ../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 "Atopadas {0} coincidencias"
 
-#: ../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"
@@ -2475,16 +2493,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Número de parámetros incorrecto para o operador nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
-"de nodos ou un rango, por exemplo nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2600,6 +2615,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
@@ -2724,5 +2739,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 ""
@@ -2743,9 +2758,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 "o parámetro \"{0}\" debe non ser nulo"
+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"
@@ -2781,5 +2799,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 "Separar segmento de vía"
@@ -2787,6 +2805,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."
@@ -2798,5 +2816,5 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2807,5 +2825,15 @@
 msgstr "Resolver conflitos en estado borrado en {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"
@@ -2889,5 +2917,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"
@@ -2994,8 +3022,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 "O valor predeterminado é \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3175,5 +3209,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
@@ -3187,5 +3221,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 ""
@@ -3193,4 +3227,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 "Faltan argumentos para 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 ""
 
@@ -3248,32 +3318,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Erro: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advertencia: {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 ""
 
@@ -3298,47 +3369,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 "Non hai unha primitiva coa versión {0} en este historial"
-
-#: ../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 "Non hai unha versión válida con data \"{0}\" en este historial"
-
-#: ../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 "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "non se atopou unha versión anterior. O historial está valeiro."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "non se atopou a última versión. O historial está valeiro."
-
-#: ../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 "Non se atopou unha primitiva coa id {0} en este paquete de datos"
-
-#: ../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 ""
-"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
-"datos"
-
-#: ../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
@@ -3349,6 +3401,7 @@
 msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
@@ -3360,145 +3413,145 @@
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
-#: ../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 "A vía de estilo de área non está pechada."
 
-#: ../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 "a vía multipoligonal \"{0}\" non está pechada."
 
-#: ../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 "Membro \"{0}\" borrado na relación."
 
-#: ../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 "Vía \"{0}\" con menos de dous puntos."
 
-#: ../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 "Atopadas máis de unha vía \"desde\"."
 
-#: ../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 "Atopadas máis de unha vía \"ata\"."
 
-#: ../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 "Atopouse máis de un \"vía\"."
 
-#: ../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 "Papel \"{0}\" descoñecido."
 
-#: ../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 "Tipo de membro descoñecido para \"{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 "Non se atoparon vias \"desde\"."
 
-#: ../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 "Non se atoparon vías \"ata\"."
 
-#: ../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 "Ningún nodo o vía \"vía\" atopados."
 
-#: ../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 "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
-#: ../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 "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Non se atopou o estilo para a restrición {0}"
 
-#: ../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 "Intersección entre as vías ''{0}'' e ''{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 "A vía interior ''{0}'' está fóra."
 
-#: ../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 "Non hai un rol ''{0}'' útil para a Vía ''{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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Sen etiquetar"
 
-#: ../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 "texto"
 
-#: ../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 "Erro: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advertencia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "Inactivo"
 
-#: ../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
@@ -3508,5 +3561,5 @@
 msgstr[1] "nodos"
 
-#: ../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
@@ -3516,6 +3569,6 @@
 msgstr[1] "vías"
 
-#: ../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
@@ -3525,13 +3578,13 @@
 msgstr[1] "relacións"
 
-#: ../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 "vía sen etiqueta"
 
-#: ../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 "vía incompleta"
 
-#: ../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
@@ -3539,5 +3592,5 @@
 msgstr "fondo"
 
-#: ../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 "destacar"
@@ -3616,5 +3669,5 @@
 msgstr "Non amosar de novo"
 
-#: ../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
@@ -3622,32 +3675,32 @@
 msgstr ""
 
-#: ../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 "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "Carretera"
 
-#: ../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 "Vía férrea"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "Vía acuática"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr ""
 
-#: ../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"
@@ -3656,5 +3709,5 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3663,33 +3716,33 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../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
@@ -3697,9 +3750,9 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Maquina descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3918,5 +3971,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 "Edición"
@@ -4042,10 +4095,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 "a capa non está na lista."
 
-#: ../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"
@@ -4053,7 +4106,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Non, cancelar a operación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4178,5 +4230,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 +4237,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 +4245,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 "Membros"
@@ -4622,5 +4674,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 ""
@@ -4678,6 +4730,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 ""
@@ -4806,4 +4856,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"
@@ -4900,5 +4951,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"
@@ -4909,5 +4960,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"
@@ -4926,7 +4977,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Conservar a miña"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -4949,7 +4999,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Introducir valores para todos os conflitos."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5035,5 +5084,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
@@ -5129,5 +5178,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"
@@ -5183,11 +5232,11 @@
 msgstr "Amosar o historial de todos os elementos seleccionados."
 
-#: ../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
@@ -5195,14 +5244,14 @@
 msgstr "Recargar"
 
-#: ../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 ""
 "Recargar todos os obxectos seleccionados actualmente e actualizar a lista."
 
-#: ../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 ""
@@ -5259,7 +5308,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] "Esto cambiará ata {0} obxecto."
@@ -5267,5 +5315,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 "Un valor vacío borra a clave."
 
@@ -5290,4 +5339,11 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
+#: ../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] "Esto cambiará ata {0} obxecto."
+msgstr[1] "Esto cambiará ata {0} obxectos."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5365,60 +5421,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 "Relacións"
 
-#: ../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 "Abrir unha lista con todas as relacións."
 
-#: ../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 "Relacións: {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 "Abrir un editor para a relación seleccionada"
 
-#: ../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 "Borrar a relación seleccionada"
 
-#: ../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 "Crear unha nova relación"
 
-#: ../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 "Borrar a relación seleccionada"
-
-#: ../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 "Seleccionar ou ben:"
-
-#: ../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 "Borrar a relación seleccionada"
-
-#: ../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 "Descargar Membros"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5576,5 +5628,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}"
@@ -5813,18 +5865,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 ""
@@ -5847,5 +5899,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}"
@@ -5927,12 +5979,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Crear áreas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Mover os membros seleccionados actualmente cara abaixo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5943,7 +5993,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 "Por favor, introduce un nome para o lugar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5953,12 +6002,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Mover os membros actualmente seleccionados cara arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Mover os membros actualmente seleccionados cara arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6018,7 +6065,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Separar unha vía no nodo seleccionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6027,7 +6073,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "A via seleccionada non contén o nodo seleccionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6051,7 +6096,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Borrar a capa seleccionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6071,12 +6115,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Mover os membros actualmente seleccionados cara arriba"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Por favor selecciona a fila a editar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6092,7 +6134,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Introduce o nome do lugar a buscar:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6106,7 +6147,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Buscar..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -7040,7 +7080,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "cerca"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7085,5 +7124,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 ""
@@ -7097,5 +7136,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 ""
@@ -7106,5 +7145,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 ""
@@ -7113,19 +7152,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 ""
@@ -7135,32 +7174,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 ""
@@ -7182,37 +7221,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 ""
@@ -7220,5 +7259,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 ""
@@ -7226,9 +7265,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 ""
@@ -7237,24 +7276,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 "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../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}"
@@ -7267,4 +7316,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Facer zoom a {0}"
+
+#: ../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 "Historial"
+
+#: ../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
@@ -7277,17 +7344,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 "Ordenar o menú de elementos preestablecidos"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "descoñecido"
+
+#: ../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 "Anónimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7312,4 +7429,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 "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "borrado"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7654,9 +7786,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] "Obxectos para modificar:"
-msgstr[1] "Obxectos para modificar:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7736,13 +7868,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
@@ -7809,5 +7941,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}..."
@@ -7819,5 +7951,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 "Imaxes xeo-etiquetadas"
@@ -7843,5 +7975,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"
@@ -7896,43 +8028,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 "punto gps"
 
 #: ../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 "Personalizar debuxo de liñas"
 
 #: ../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 "Usar configuración global."
 
 #: ../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 "Debuxar liñas entre puntos para esta capa."
 
 #: ../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 "Non debuxar liñas entre puntos para esta capa."
 
 #: ../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 "Seleccionar as opcións de liña do debuxo"
 
 #: ../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 "Personalizar Cor"
 
 #: ../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"
@@ -7940,6 +8072,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"
@@ -8029,10 +8161,10 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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."
@@ -8042,43 +8174,43 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../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 "Convertido de: {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 ""
 
-#: ../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 "Descargar todo o que abarca:"
 
-#: ../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} metros"
 
-#: ../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 "Área máxima por petición:"
 
-#: ../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} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8089,9 +8221,9 @@
 "Desexas<br>continuar?</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 "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../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 "
@@ -8099,5 +8231,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8159,33 +8291,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} borrados.)"
-msgstr[1] " ({0} borrados.)"
-
-#: ../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} composto de:"
 
-#: ../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 ""
 
-#: ../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 "Convertir a capa GPX"
 
-#: ../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 +8325,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 +8332,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 +8338,5 @@
 msgstr[1] "puntos"
 
-#: ../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 +8345,5 @@
 msgstr[1] "un trazado con {0} puntos"
 
-#: ../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 +8352,5 @@
 msgstr[1] "{0} componse de {1} trazados"
 
-#: ../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 +8359,9 @@
 msgstr[1] "{0} puntos"
 
-#: ../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 "marca gps"
 
-#: ../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 +8369,5 @@
 msgstr[1] "marcas"
 
-#: ../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,9 +8376,9 @@
 msgstr[1] "{0} componse de {1} marcas"
 
-#: ../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 "Sincronizar Audio"
 
-#: ../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."
@@ -8254,5 +8386,5 @@
 "Debes pausar o audio no momento que escoites a túa entrada de sincronización."
 
-#: ../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
@@ -8260,14 +8392,14 @@
 msgstr "Audio sincronizado no punto {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 "Non se pode sincronizar nunha capa en reproducción."
 
-#: ../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 ""
 
-#: ../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 "
@@ -8275,13 +8407,13 @@
 msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
 
-#: ../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 ""
 
-#: ../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 "Amosar/Ocultar Texto/Iconas"
 
-#: ../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 "Cambiar o estado visible do texto e iconas da marca."
@@ -8346,5 +8478,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 "Por favor selecciona a fila a editar."
@@ -8358,5 +8490,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 +9237,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Borrar da lista a fonte seleccionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Editar o valor da clave seleccionada para todos os obxectos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9124,17 +9254,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Engadir nodo na vía"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Actualizar a lista de seleccion."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Borrar a relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9777,5 +9904,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}''."
@@ -9802,5 +9929,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}."
@@ -9808,5 +9935,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}"
@@ -9819,5 +9946,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}''."
@@ -9970,5 +10097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9977,38 +10104,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 ""
@@ -10016,19 +10143,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 "Especificación incompleta de elemento <member> con 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 "Obxecto ilegal con 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 ""
@@ -10039,9 +10166,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 ""
@@ -10051,25 +10178,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 ""
@@ -10077,5 +10204,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10084,5 +10211,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10090,5 +10217,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10097,13 +10224,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 "Preparar os datos de OSM..."
 
-#: ../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 ""
@@ -10255,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] "Engadido actualizado con éxito. Por favor reinicia JOSM."
-msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10319,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 "Actualizar Engadidos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10461,35 +10587,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 "descoñecido"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11108,47 +11203,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 ""
 
-#: ../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 ""
 
-#: ../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 "Un dos ficheiros seleccionados era nulo !!!"
-
-#: ../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 "Ler fotos..."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Atopouse un ficheiro nulo no directorio {0}\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 "Erro obtendo ficheiros do directorio {0}\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 ""
 
-#: ../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."
@@ -11164,24 +11258,24 @@
 msgstr "Cargar conxunto de imaxes como unha nova capa"
 
-#: ../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 "Ficheiros GPX (*.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 "O ficheiro {0} cárgase baixo o nome \"{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 "Erro durante a análise {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 "Non se puido ler \"{0}\""
 
-#: ../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."
@@ -11190,34 +11284,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11225,69 +11319,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11296,9 +11390,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11307,65 +11401,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11373,13 +11467,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 ""
 
-#: ../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 ""
 
-#: ../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 "Valores Predeterminados"
@@ -11400,5 +11494,5 @@
 msgstr "Erro no ficheiro {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11411,37 +11505,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 "Erro cargando ficheiro"
 
-#: ../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 "Ficheiro de caché da Zona Lambert 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 "Ficheiro de caché da Zona Lambert 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 "Ficheiro de caché da Zona Lambert 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 "Ficheiro de caché da Zona Lambert 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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11453,18 +11547,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11491,34 +11585,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11530,18 +11624,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11549,5 +11643,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11555,44 +11649,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11600,31 +11694,31 @@
 "tamaño"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11632,30 +11726,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11663,29 +11757,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11694,13 +11788,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"
@@ -11708,5 +11802,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"
@@ -11714,14 +11808,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"
@@ -11729,14 +11823,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"
@@ -11744,64 +11838,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11809,25 +11903,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11837,14 +11931,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11852,5 +11946,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
@@ -11858,5 +11952,5 @@
 msgstr ""
 
-#: ../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"
@@ -11864,34 +11958,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11902,18 +11996,18 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12020,9 +12114,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -12039,11 +12133,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 ""
 
 #: ../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 ""
@@ -12053,5 +12147,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 ""
@@ -12261,5 +12355,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12681,5 +12775,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12758,5 +12852,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12889,7 +12983,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Capas"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13053,42 +13146,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 ""
 
-#: ../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 "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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13124,7 +13216,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "nivel de zoom"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13469,6 +13560,6 @@
 msgstr ""
 
-#: ../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
@@ -13476,5 +13567,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13561,5 +13652,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13688,18 +13779,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13853,80 +13944,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13934,87 +14025,87 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Borrar da lista a fonte seleccionada."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Usar ficheiro de datos por defecto."
 
-#: ../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 "Usar o ficheiro de datos por defecto (recomendado)."
 
-#: ../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 "Usar ficheiro de comprobación ortográfica predeterminado."
 
-#: ../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 ""
 "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14189,17 +14280,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14250,13 +14341,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14300,61 +14391,64 @@
 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 "Descargar"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Descargar datos do mapa do servidor OSM."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Acoplar {0} nodos"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14457,28 +14551,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14489,55 +14583,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 "Gardar capa WMS nun ficheiro"
 
-#: ../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 "Cargar capa WMS dende ficheiro"
 
-#: ../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 "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
@@ -26933,18 +27027,131 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "O ficheiro non puido ser atopado"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relación contradictoria"
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Non hai unha primitiva coa versión {0} en este historial"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "non se atopou unha versión anterior. O historial está valeiro."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "non se atopou a última versión. O historial está valeiro."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
+#~ "datos"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
+#~ "logo de esperar un tempo."
+
+#~ msgid "Unknown version"
+#~ msgstr "Versión descoñecida"
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Cambios non gardados"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Por favor introduce unha cadea de busca"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
+
+#~ msgid "Occupied By"
+#~ msgstr "Ocupado por"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)"
+
+#~ msgid "Move Up"
+#~ msgstr "Mover cara arriba"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Engadir todos os obxectos seleccionados actualmente como membros"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Eliminar Seleccionados"
+
+#~ msgid "Move Down"
+#~ msgstr "Mover cara abaixo"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Editor de Relación: {0}"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Erro analizando a resposta do servidor."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Non se pode conectar co servidor."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fai click en Recargar para actualizar a lista"
+
+#~ msgid "Object"
+#~ msgstr "Obxecto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Revertir"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á "
+#~ "versión seleccionada na lista do historial."
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autores: {0}"
+
+#~ msgid "Delete Layer"
+#~ msgstr "Borrar Capa"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Nome de usuario OSM (correo-e)"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Fonte de etiquetado preestablecido"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Fontes de etiquetado preestablecido."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
 
 #~ msgid "Error while parsing"
 #~ msgstr "Erro durante a análise"
 
-#~ msgid "File not found"
-#~ msgstr "Ficheiro non atopado"
+#~ msgid "their version:"
+#~ msgstr "a súa version:"
+
+#~ msgid "my version:"
+#~ msgstr "a miña versión:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versión final:"
 
 #~ msgid "Please enter the desired coordinates first."
@@ -26954,15 +27161,31 @@
 #~ msgstr "Selecciona primeiro un marcador."
 
-#~ msgid "Please enter a search string"
-#~ msgstr "Por favor introduce unha cadea de busca"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar axuste preestablecido \"{0}\""
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ten referencia cero"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Atopouse un elemento <member> no que non é unha relación."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "ID de nodo mal formada"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "O engadido {0} semella estar estropeado ou non puido ser descargado "
+#~ "automáticamente."
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "O engadido require a actualización de JOSM: {0}."
 
 #~ msgid ""
@@ -26973,128 +27196,4 @@
 #~ "advertencia<br>establecendoos coa opción de configuración 'pluginmanager."
 #~ "warntime'.)"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
-#~ "logo de esperar un tempo."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versión descoñecida"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Cambios non gardados"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
-
-#~ msgid "Occupied By"
-#~ msgstr "Ocupado por"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)"
-
-#~ msgid "Move Up"
-#~ msgstr "Mover cara arriba"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Engadir todos os obxectos seleccionados actualmente como membros"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eliminar Seleccionados"
-
-#~ msgid "Move Down"
-#~ msgstr "Mover cara abaixo"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor de Relación: {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erro analizando a resposta do servidor."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Non se pode conectar co servidor."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fai click en Recargar para actualizar a lista"
-
-#~ msgid "Object"
-#~ msgstr "Obxecto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Revertir"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á "
-#~ "versión seleccionada na lista do historial."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autores: {0}"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Borrar Capa"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nome de usuario OSM (correo-e)"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Fonte de etiquetado preestablecido"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Fontes de etiquetado preestablecido."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
-
-#~ msgid "their version:"
-#~ msgstr "a súa version:"
-
-#~ msgid "my version:"
-#~ msgstr "a miña versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión final:"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar axuste preestablecido \"{0}\""
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ten referencia cero"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Atopouse un elemento <member> no que non é unha relación."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ID de nodo mal formada"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "O engadido {0} semella estar estropeado ou non puido ser descargado "
-#~ "automáticamente."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "O engadido require a actualización de JOSM: {0}."
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -27128,6 +27227,12 @@
 #~ "{0}"
 
+#~ msgid "File could not be found."
+#~ msgstr "O ficheiro non puido ser atopado"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Extensión de ficheiro descoñecida."
+
+#~ msgid "File not found"
+#~ msgstr "Ficheiro non atopado"
 
 #~ msgid ""
@@ -27167,4 +27272,7 @@
 #~ msgstr "Todas as vías están vacías"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
+
 #~ msgid "History of Element"
 #~ msgstr "Historial do Elmento"
@@ -27249,4 +27357,7 @@
 #~ msgstr "Borrar {1} {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Relación contradictoria"
+
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -27269,4 +27380,7 @@
 #~ msgid "Empty member in relation."
 #~ msgstr "Membro vacío na relación."
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
 
 #~ msgid "EPSG:4326"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 18508)
+++ applications/editors/josm/i18n/po/he.po	(revision 18656)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
 "PO-Revision-Date: 2009-10-17 15:07+0000\n"
 "Last-Translator: Tsvi Mostovicz <ttmost@gmail.com>\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:23+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 "שגיאה"
@@ -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"
@@ -316,5 +317,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
@@ -332,6 +333,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
@@ -342,5 +343,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
@@ -459,5 +460,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
@@ -499,5 +500,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
@@ -506,6 +507,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"
@@ -688,5 +690,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
@@ -699,5 +701,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"
@@ -769,5 +771,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
@@ -775,28 +785,28 @@
 msgstr ""
 
-#: ../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 "נמצאו {0} התנגשויות במהלך היבוא"
 
-#: ../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}"
@@ -833,10 +843,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 "ייצא ל-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 "ייצא נתונים לקובץ GPX."
@@ -849,11 +859,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
@@ -884,5 +893,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
@@ -897,17 +905,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
@@ -967,5 +976,5 @@
 msgstr "צרף צומת למקטעי הדרך הקרובים ביותר"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "צרף צומת וקו"
@@ -996,20 +1005,19 @@
 msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "מבטל..."
-
-#: ../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 "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1150,7 +1158,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "מוריד נתונים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1297,10 +1304,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 "שמירה"
 
 #: ../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 "שמור את הנתונים הנוכחיים."
@@ -1357,10 +1364,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 "שמור בשם..."
 
 #: ../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 "שמור את המידע הנוכחי לקובץ חדש."
@@ -1401,25 +1408,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 "סגור"
 
-#: ../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 "פצל דרך"
 
-#: ../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 "פצל דרך בנקודה הבחורה."
 
-#: ../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 "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
 
-#: ../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."
@@ -1427,5 +1434,5 @@
 msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
 
-#: ../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 "
@@ -1437,9 +1444,9 @@
 msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
 
-#: ../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 "הנקודות הבחורות אינן שייכות לאותה דרך."
 
-#: ../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."
@@ -1447,10 +1454,10 @@
 msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
 
-#: ../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 "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
 
-#: ../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 "
@@ -1458,5 +1465,5 @@
 msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
 
-#: ../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 "
@@ -1464,5 +1471,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 "
@@ -1470,5 +1477,5 @@
 msgstr ""
 
-#: ../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"
@@ -1498,47 +1505,47 @@
 msgstr "שכפל נקודות המשותפות למספר דרכים."
 
-#: ../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 "הנקודה לא מוצמדת לשום דבר אחר."
 
-#: ../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 "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר."
 
-#: ../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 "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
 
-#: ../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 "הבחירה הנוכחית אינה יכולה לשמש להפרדה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "בחר:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../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 "* נקודה אחת המשותפת ליותר מדרך אחת, או"
 
-#: ../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 "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
 
-#: ../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"
 msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או"
 
-#: ../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."
 msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת."
 
-#: ../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"
@@ -1548,9 +1555,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "הפרד נקודה"
 
-#: ../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"
@@ -1558,5 +1565,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"
@@ -1597,12 +1604,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "צייר את גבולות המידע שמורד מהשרת."
+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 ""
@@ -1618,6 +1624,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "עדכן בחירה"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1631,10 +1638,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 "העתק את הפריטים הנבחרים אל חוצץ ההדבקה."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "בחירה ריקה"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "עדכן בחירה"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1779,7 +1792,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "שנה עצם {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1901,9 +1914,9 @@
 msgstr "הורדו נתוני GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "מוריד נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1911,5 +1924,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 ""
@@ -1925,7 +1938,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "שם המשתמש."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1969,7 +1981,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "שגיאות במהלך הורדה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1983,5 +1994,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
@@ -2014,6 +2025,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 "נבחר"
@@ -2031,26 +2042,26 @@
 msgstr "הוסף צומת לדרך"
 
-#: ../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 "חבר דרך קיימת לצומת"
 
-#: ../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 "הוסף צומת חדש לדרך קיימת"
 
-#: ../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 "הוסף צומת לדרך וחבר"
 
-#: ../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 "יוצר נקודה חדשה."
 
-#: ../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 "בחר את הנקודה שמתחת לסמן."
 
-#: ../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."
@@ -2059,46 +2070,44 @@
 msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
 
-#: ../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 "התחל דרך חדשה מהנקודה האחרונה."
 
-#: ../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 "המשך דרך מהנקודה האחרונה."
 
-#: ../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 "הפסק לצייר."
 
-#: ../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 "הוצאה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "צור אזורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "הבלטת דרך"
 
-#: ../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 "שחרר את לחצן העכבר לבחירת פריטים במרובע."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "צייר מרובע בגודל הרצוי, ואז שחרר את לחצן העכבר."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "צייר מרובע בגודל הרצוי, ואז שחרר את לחצן העכבר."
 
-#: ../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 "שחרר את סמן העכבר להפסקת ההטייה"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "גרור מקטע דרך ליצירת מרובע"
 
@@ -2155,4 +2164,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2160,4 +2173,8 @@
 msgstr ""
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "שחרר את סמן העכבר להפסקת ההטייה"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2183,67 +2200,70 @@
 msgstr ""
 
-#: ../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 "חפש..."
 
-#: ../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 "חיפוש אחר פריטים."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "נא הזן מחרוזת לחיפוש."
 
-#: ../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 "ביטוי רגולרי"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "החלפת הבחירה"
 
-#: ../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 "הוספה לבחירה"
 
-#: ../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 "הסר מהבחירה"
 
-#: ../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 "רגיש להבדל בין אותיות גדולות וקטנות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "ביטוי רגולרי"
 
-#: ../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>רחוב אבג</b>-'רחוב' ו'אבג' בכל מפתח או שם."
 
-#: ../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>\"רחוב אבג\"</b>-'רחוב אבג' בכל מפתח או שם."
 
-#: ../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:אבג</b>-'אבג' איפשהו בשם."
 
-#: ../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>-מפתח 'type' עם הערך '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>, "
@@ -2253,79 +2273,78 @@
 "<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:אבג</b>-ללא 'אבג' בשם."
 
-#: ../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>-מפתח 'foot' עם כל ערך."
 
-#: ../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>מטרות מיוחדות:</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>-סוג העצם (<b>נקודה</b>, <b>דרך</b>, <b>יחס</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>user:</b>...-כל העצמים ששונו ע\"י המשתמש"
 
-#: ../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>...-עצמים עם מספר הנקודות הנתון"
 
-#: ../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>...-עצמים עם מספר הנקודות הנתון"
-
-#: ../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>...- כל העצמים ששונו"
 
-#: ../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> - כל העצמים הבחורים"
 
-#: ../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> - כל העצמים הבלתי גמורים"
 
-#: ../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>untagged</b> - כל העצמים הלא מתוייגים"
 
-#: ../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 "השתמש ב-<b>|</b> או <b>OR</b> כדי לחבר ב\"או\" לוגי"
 
-#: ../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 ""
 
-#: ../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 "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
 
-#: ../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
@@ -2335,51 +2354,51 @@
 msgstr ""
 
-#: ../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 "חפש"
 
-#: ../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 "התחל חיפוש"
 
-#: ../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 "לא נמצאה התאמה עבור \"{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 "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
 
-#: ../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 "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\""
 
-#: ../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} התאמות"
 
-#: ../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"
@@ -2428,7 +2447,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
@@ -2551,6 +2569,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
@@ -2675,5 +2693,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 ""
@@ -2694,9 +2712,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 "פרמטר ''{0}'' אינו יכול להיות אפס"
+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"
@@ -2732,5 +2753,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 "פצל קטע דרך"
@@ -2738,6 +2759,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."
@@ -2748,5 +2769,5 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2757,5 +2778,15 @@
 msgstr ""
 
-#: ../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"
@@ -2837,5 +2868,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"
@@ -2940,8 +2971,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
 msgid "Illegal double value ''{0}''"
-msgstr "ערך ברירת המחדל הוא \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3121,5 +3158,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
@@ -3133,5 +3170,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 ""
@@ -3139,4 +3176,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 "חסרים ארגומנטים ל-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 ""
 
@@ -3194,32 +3267,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "שגיאה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "אזהרה: {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 ""
 
@@ -3244,45 +3318,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 "פרמטר ''{0}'' אינו יכול להיות אפס"
+
+#: ../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
@@ -3293,6 +3350,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 ""
 
@@ -3303,145 +3361,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 ""
 
-#: ../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 ""
 
-#: ../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 "מחק איבר \"{0}\" ביחס."
 
-#: ../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 "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../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 ""
 
-#: ../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 "יותר מ-\"to\" אחד נמצא."
 
-#: ../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 "יותר מ-\"via\" אחד נמצא."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "אף דרך \"from\" לא נמצאה."
 
-#: ../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 "אף דרך \"to\" לא נמצאה."
 
-#: ../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 "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "דרך פנימית ''{0}'' נמצאת בחוץ."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "לא מתוייג"
 
-#: ../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 "טקסט"
 
-#: ../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 "שגיאה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "אזהרה: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "לא פעיל"
 
-#: ../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
@@ -3451,5 +3509,5 @@
 msgstr[1] "צמתים"
 
-#: ../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
@@ -3459,6 +3517,6 @@
 msgstr[1] "דרכים"
 
-#: ../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
@@ -3468,13 +3526,13 @@
 msgstr[1] "יחסים"
 
-#: ../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 "דרך לא מתויגת"
 
-#: ../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 "דרך לא גמורה"
 
-#: ../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
@@ -3482,5 +3540,5 @@
 msgstr "רקע"
 
-#: ../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 ""
@@ -3559,5 +3617,5 @@
 msgstr "אל תציג שוב"
 
-#: ../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
@@ -3565,32 +3623,32 @@
 msgstr ""
 
-#: ../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 "לא גמור"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "כביש ראשי"
 
-#: ../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 "מסילת רכבת"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "נתיב מים"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr ""
 
-#: ../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"
@@ -3599,5 +3657,5 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3606,33 +3664,33 @@
 msgstr[1] "{0} חברים"
 
-#: ../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
@@ -3640,9 +3698,9 @@
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "מארח לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3664,7 +3722,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3860,5 +3917,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 "ערוך"
@@ -3984,10 +4041,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 "השכבה אינה ברשימה."
 
-#: ../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"
@@ -3995,7 +4052,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "לא, בטל את הפעולה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4117,5 +4173,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"
@@ -4124,5 +4180,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"
@@ -4132,5 +4188,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 "חברים"
@@ -4567,5 +4623,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 ""
@@ -4623,6 +4679,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 "<לא מוגדר>"
@@ -4751,4 +4805,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"
@@ -4845,5 +4900,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"
@@ -4854,5 +4909,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"
@@ -4871,7 +4926,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "שמור את שלי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -4894,7 +4948,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "הזן ערכים לכל ההתנגשויות."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4980,5 +5033,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
@@ -5072,5 +5125,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"
@@ -5126,11 +5179,11 @@
 msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים."
 
-#: ../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
@@ -5138,13 +5191,13 @@
 msgstr "טען מחדש"
 
-#: ../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 "טען מחדש את כל העצמים הבחורים ורענן את הרשימה."
 
-#: ../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 ""
@@ -5201,7 +5254,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] "זה ישנה עד עצם {0}"
@@ -5209,5 +5261,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 "ערך ריק מוחק את המפתח."
 
@@ -5232,4 +5285,11 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
+#: ../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] "זה ישנה עד עצם {0}"
+msgstr[1] "זה ישנה עד {0} עצמים"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5306,60 +5366,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 "יחסים"
 
-#: ../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 "פתח רשימה של כל היחסים."
 
-#: ../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 "יחסים: {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 "פתח עורך עבור היחס הנבחר"
 
-#: ../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 "מחק את היחס הנבחר"
 
-#: ../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 "צור יחס חדש"
 
-#: ../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 "מחק את היחס הנבחר"
-
-#: ../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 "בחר:"
-
-#: ../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 "מחק את היחס הנבחר"
-
-#: ../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 "הורד חברים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5514,5 +5570,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}"
@@ -5751,18 +5807,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 ""
@@ -5785,5 +5841,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}"
@@ -5865,12 +5921,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "צור אזורים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "הזז מטה את החברים שנבחרו"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5881,7 +5935,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 "נא הזן שם עבור המיקום."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5891,12 +5944,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "הזז את החברים הנבחרים מעלה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "הזז את החברים הנבחרים מעלה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5955,7 +6006,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "פצל דרך בנקודה הבחורה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5964,7 +6014,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5988,7 +6037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "מחק את השכבה הנבחרת."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6005,12 +6053,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "הזז את החברים הנבחרים מעלה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "נא בחר את השורה לעריכה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6026,7 +6072,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "הזן שם מקום לחיפוש:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6040,12 +6085,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "חפש..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "כיוון לחיפוש אדמה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -6975,7 +7018,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "קרוב"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7020,5 +7062,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 ""
@@ -7032,5 +7074,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 ""
@@ -7041,5 +7083,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 ""
@@ -7048,19 +7090,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 ""
@@ -7070,32 +7112,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 ""
@@ -7117,37 +7159,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 ""
@@ -7155,5 +7197,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 ""
@@ -7161,9 +7203,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 ""
@@ -7172,24 +7214,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 "פרמטר ''{0}'' אינו יכול להיות אפס"
+
+#: ../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}"
@@ -7202,4 +7254,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "התמקד בבעיה"
+
+#: ../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 "היסטוריה"
+
+#: ../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
@@ -7212,17 +7282,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 "לא נמחק"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "משתמש"
 
-#: ../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 "לא ידוע"
+
+#: ../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 "אנונימי"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7247,4 +7367,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 "גירסא {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "מחוק"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7589,9 +7724,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] "פריטים לשינוי:"
-msgstr[1] "פריטים לשינוי:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7671,13 +7806,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
@@ -7744,5 +7879,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}..."
@@ -7754,5 +7889,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 "תמונות בעלות גאותגיות"
@@ -7778,5 +7913,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"
@@ -7831,43 +7966,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"
 
 #: ../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 "התאם ציור קו"
 
 #: ../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 "השתמש בהגדרות הגלובליות."
 
 #: ../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 "צייר קווים בין נקודות בשכבה זו."
 
 #: ../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 "אל תצייר קווים בין נקודות בשכבה זו."
 
 #: ../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 "בחר אפשרויות ציור קו"
 
 #: ../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 "התאם צבעים"
 
 #: ../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"
@@ -7875,6 +8010,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"
@@ -7964,10 +8099,10 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../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 "המר לשכבת נתונים"
 
-#: ../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."
@@ -7977,43 +8112,43 @@
 "מסלולים, ראה כאן:"
 
-#: ../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 "המר מ: {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 ""
 
-#: ../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 "הורד הכל עם:"
 
-#: ../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} מטרים"
 
-#: ../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 "שטח מירבי לבקשה"
 
-#: ../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} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8024,9 +8159,9 @@
 "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 ""
 
-#: ../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 "
@@ -8034,5 +8169,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8094,33 +8229,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} נמחק/ו.)"
-msgstr[1] " ({0} נמחק/ו.)"
-
-#: ../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} מורכב מ-:"
 
-#: ../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: {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 "המר לשכבת GPX"
 
-#: ../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."
@@ -8128,5 +8263,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"
@@ -8135,5 +8270,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"
@@ -8141,5 +8276,5 @@
 msgstr[1] "נקודות"
 
-#: ../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"
@@ -8148,5 +8283,5 @@
 msgstr[1] "מסלול בעל {0} נקודות"
 
-#: ../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"
@@ -8155,5 +8290,5 @@
 msgstr[1] "{0} מורכב מ-{1} מסלולים"
 
-#: ../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"
@@ -8162,9 +8297,9 @@
 msgstr[1] "{0} נקודות"
 
-#: ../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"
 
-#: ../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"
@@ -8172,5 +8307,5 @@
 msgstr[1] "סמנים"
 
-#: ../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"
@@ -8179,14 +8314,14 @@
 msgstr[1] "{0} מורכב מ-{1} סמנים"
 
-#: ../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 "סנכרן שמע"
 
-#: ../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 ""
 
-#: ../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
@@ -8194,14 +8329,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8209,13 +8344,13 @@
 msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
 
-#: ../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 ""
 
-#: ../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 "הצג\\הסתר טקסט\\סמלים"
 
-#: ../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 ""
@@ -8279,5 +8414,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 "נא בחר את השורה לעריכה."
@@ -8291,5 +8426,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."
@@ -9000,12 +9135,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "מחק את המקור הנבחר מהרשימה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9019,17 +9152,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "הוסף שכבה חדשה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "רענן את רשימת הבחירה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "ערוך את המקור הנבחר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9643,5 +9773,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}''."
@@ -9668,5 +9798,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}."
@@ -9674,5 +9804,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}"
@@ -9685,5 +9815,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}''."
@@ -9834,5 +9964,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9841,38 +9971,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 ""
@@ -9880,19 +10010,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 ""
 
-#: ../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 "עצם לא חוקי עם 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 ""
@@ -9903,9 +10033,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 ""
@@ -9915,25 +10045,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 ""
@@ -9941,5 +10071,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9948,5 +10078,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9954,5 +10084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9961,13 +10091,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..."
 
-#: ../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 ""
@@ -10117,9 +10247,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} תוסף עודכן בהצלחה. נא לאתחל את JOSM."
-msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10181,7 +10311,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "עדכן תוספים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10320,35 +10449,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 "לא ידוע"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10969,47 +11067,46 @@
 "{0} קמ\"ש"
 
-#: ../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 מ-EXIF"
 
-#: ../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 "מתחיל סריקת ספרייה"
 
-#: ../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 "אחד מהקבצים הנבחרים היה null !!!"
-
-#: ../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 "קורא תמונות..."
 
-#: ../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 "לא יכול לקבל נתיב קנוני לתיקייה {0}\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 "קורא ספרייה {0}"
 
-#: ../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 "נמצא קובץ null בתיקייה {0}\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 "שגיאה בזמן קבלת קבצים מהסיפריה {0}\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 ""
 
-#: ../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."
@@ -11025,24 +11122,24 @@
 msgstr "פתח סט תמונות כשכבה חדשה."
 
-#: ../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‏ (*.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 ""
 
-#: ../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 "שגיאה בעת ניתוח {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 "לא ניתן לקרוא את \"{0}\""
 
-#: ../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."
@@ -11051,34 +11148,34 @@
 msgstr ""
 
-#: ../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 "זמן צילום (מ-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 (נקרא מהצילום למעלה): "
 
-#: ../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 "אני באזור זמן: "
 
-#: ../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 "אין תאריך"
 
-#: ../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 "פתח תמונה אחרת"
 
-#: ../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 ""
 
-#: ../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"
@@ -11086,69 +11183,69 @@
 msgstr "שגיאה בזמן ניתוח התאריך:"
 
-#: ../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 "תאריך שגוי"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "אזור זמן: "
 
-#: ../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 "היסט:"
 
-#: ../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 ""
 
-#: ../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 "עדכן מיקום עבור: "
 
-#: ../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 "כל התמונות"
 
-#: ../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 "תמונות ללא מיקום exif"
 
-#: ../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 "תמונות שעדיין לא תויגו"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11159,9 +11256,9 @@
 "פורמט מצופה: {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 "אזור זמן שגוי"
 
-#: ../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 ""
@@ -11172,65 +11269,65 @@
 "פורמט מצופה: {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 "היסט שגוי"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11238,13 +11335,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11265,5 +11362,5 @@
 msgstr "שגיאה בקובץ {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11276,37 +11373,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 "שגיאה בטעינת קובץ"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11318,18 +11415,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "בחר מ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11356,34 +11453,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "קבע רקע שקוף."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11395,18 +11492,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "מקור"
 
-#: ../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 "
@@ -11414,5 +11511,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11420,74 +11517,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11495,30 +11592,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11526,29 +11623,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11557,13 +11654,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"
@@ -11571,5 +11668,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"
@@ -11577,14 +11674,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"
@@ -11592,14 +11689,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"
@@ -11607,64 +11704,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "שנה מיקום"
 
-#: ../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 "קבע מיקום חדש לבקשה הבאה"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "הוסף שכבה חדשה"
 
-#: ../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 "מיקום"
 
-#: ../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 "
@@ -11672,25 +11769,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11700,14 +11797,14 @@
 msgstr[1] "פשט דרך (הסר {0} נקודות)"
 
-#: ../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"
 
-#: ../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"
@@ -11715,5 +11812,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
@@ -11721,5 +11818,5 @@
 msgstr "הורד משטח WMS מ-{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"
@@ -11727,34 +11824,34 @@
 msgstr ""
 
-#: ../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 "שכבה ריקה"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11763,18 +11860,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11881,9 +11978,9 @@
 msgstr "ייצר דרך משוכפלת"
 
-#: ../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 ""
@@ -11900,11 +11997,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 "ייבא נתיב משכבת GPX"
 
 #: ../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 "זנח נתיב קיים"
@@ -11914,5 +12011,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 "לא נמצאה שכבת נתוני GPX"
@@ -12122,5 +12219,5 @@
 msgstr "הצג תמונות ללא תיוג גיאוגרפי"
 
-#: ../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 "תמונות מיובאות"
@@ -12545,5 +12642,5 @@
 msgstr "זווית בין שתי נקודות בחורות"
 
-#: ../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 "שכבה לעריכת מדידות."
@@ -12622,5 +12719,5 @@
 msgstr "לולאת הורדה של 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 ""
@@ -12754,7 +12851,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "שכבה"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12920,43 +13016,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 ""
 
-#: ../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 "מיקוד אוטומטי: "
-
-#: ../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 "טען משטח"
 
-#: ../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 "הראה מצב משטח"
-
-#: ../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 "טען את כל המשטחים"
 
-#: ../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 "הגדל"
 
-#: ../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 "הקטן"
 
-#: ../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 ""
@@ -12992,7 +13086,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "רמת מיקוד מירבית: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13337,6 +13430,6 @@
 msgstr "האם אתה בטוח?"
 
-#: ../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
@@ -13344,5 +13437,5 @@
 msgstr "שגיאת תקינות"
 
-#: ../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 "אין שגיאות תקינות"
@@ -13431,5 +13524,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13529,7 +13622,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "קו חוף"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13559,18 +13651,18 @@
 msgstr "דרכים חוצות"
 
-#: ../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 "נקודות כפולות"
 
-#: ../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 "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
 
-#: ../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 ""
@@ -13724,80 +13816,80 @@
 #. 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 "בעיית ציור"
 
-#: ../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 "מפתח \"{0}\" לא תקין."
 
-#: ../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 "תוויות עם ערכים ריקים"
 
-#: ../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 "מפתח תכונה לא תקין"
 
-#: ../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 "רווח לא תקין במפתח תכונה"
 
-#: ../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 "ערכי תכונות מתחילים או מסתיימים ברווח"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "בדוק מפתחות תכונות."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13805,86 +13897,86 @@
 msgstr ""
 
-#: ../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 "הוסף מקור חדש לרשימה"
 
-#: ../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 "ערוך את המקור הנבחר"
 
-#: ../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 "מחק את המקור הנבחר מהרשימה"
 
-#: ../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 "מקורות נתונים"
 
-#: ../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 "בדוק ערכי תכונות."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)."
 
-#: ../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 "השתמש בברירת המחדל לקובץ בודק האיות"
 
-#: ../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 ""
 
-#: ../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 "תקן תכונות"
 
-#: ../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 "לא יכול למצוא את סוג האלמנט"
 
-#: ../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 "לא יכול למצוא את דרגת האזהרה"
 
-#: ../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 "ביטוי לא חוקי \"{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}''"
@@ -14059,17 +14151,17 @@
 msgstr "מבחן זה בודק אם לדרך יש נקודת קצה שקרובה מאוד לדרך אחרת."
 
-#: ../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 "נקודת קצה של דרך נמצאת ליד דרך ראשית אחרת"
 
-#: ../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 "נקודת קצה של דרך נמצאת ליד דרך אחרת"
 
-#: ../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 "נקודת דרך נמצאת ליד דרך אחרת"
 
-#: ../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 "נקודת קצה מחוברת של דרך נמצאת ליד דרך אחרת"
@@ -14120,13 +14212,13 @@
 msgstr "מבחן זה בודק את הכיוון של דרכי מים, אדמה וקווי חוף."
 
-#: ../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 "קו חוף הפוך: האדמה לא בצד שמאל"
 
-#: ../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 "מים הפוכים: האדמה לא בצד שמאל"
 
-#: ../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 "אדמה הפוכה: האדמה לא בצד שמאל"
@@ -14170,18 +14262,60 @@
 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 "הורד"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "הורד נתוני מפה משרת ה-OSM."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "מוריד נקודות כפולות..."
+
+#: ../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 ""
 
@@ -14189,43 +14323,4 @@
 msgid "Exception occurred"
 msgstr "אירעה שגיאה"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "עזרה"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "עזרה \\ אודות"
-
-#: ../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"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14327,28 +14422,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "הורדה אוטומטית"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14359,55 +14454,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../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 לקובץ"
 
-#: ../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 מקובץ"
 
-#: ../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 "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
@@ -18831,14 +18926,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "אתר ארכיאולוגי"
+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 "ערוך אתר ארכיאולוגי"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26807,91 +26900,63 @@
 msgstr ""
 
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
+
+#~ msgid "help"
+#~ msgstr "עזרה"
+
+#~ msgid "Help / About"
+#~ msgstr "עזרה \\ אודות"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "עזרת תוסף WMS"
+
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "No data imported."
+#~ msgstr "לא יובאו נתונים."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "נא הזן את נקודות הציון הרצויות תחילה."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "בחר סימניה תחילה."
+
 #~ msgid "File could not be found."
 #~ msgstr "לא ניתן למצוא את הקובץ."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "אנא בחר לפחות משימה אחת להורדה"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "העלאה ל-API של OSM נכשלה"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "יחס מתנגש"
+#~ msgid "No document open so nothing to save."
+#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "סיומת הקובץ אינה ידועה."
+
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "התנגשויות מתמזגות"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "שינויים לא שמורים"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
 
 #~ msgid "Error while parsing"
 #~ msgstr "שגיאה בעת פיענוח"
-
-#~ msgid "File not found"
-#~ msgstr "קובץ לא נמצא"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "נא הזן את נקודות הציון הרצויות תחילה."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "בחר סימניה תחילה."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "נא הזן מחרוזת לחיפוש"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
-
-#~ msgid "name"
-#~ msgstr "שם"
-
-#~ msgid "zoom"
-#~ msgstr "מיקוד"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "בחר שורה להעתקה"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
-#~ "התצורה 'pluginmanager.warntime')."
-
-#~ msgid "Request Update"
-#~ msgstr "בקש עדכון"
-
-#~ msgid "requested: {0}"
-#~ msgstr "התבקש: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "שגיאה בבקשת עדכון"
-
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "No data imported."
-#~ msgstr "לא יובאו נתונים."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "התנגשויות מתמזגות"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "שינויים לא שמורים"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
 
 #~ msgid "their version:"
@@ -26923,4 +26988,7 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "כל הדרכים היו ריקות"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "אנא בחר לפחות משימה אחת להורדה"
 
 #~ msgid "Can only edit help pages from JOSM Online Help"
@@ -26999,4 +27067,7 @@
 #~ msgstr "מחברים: {0}"
 
+#~ msgid "name"
+#~ msgstr "שם"
+
 #~ msgid "OSM username (email)"
 #~ msgstr "שם משתמש OSM (אי-מייל)"
@@ -27008,4 +27079,7 @@
 #~ msgstr "התוסף כבר קיים"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "נא הזן מחרוזת לחיפוש"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "ייבא קובץ TCX..."
@@ -27020,4 +27094,7 @@
 #~ msgstr "נבחרה רק נקודה אחת"
 
+#~ msgid "File not found"
+#~ msgstr "קובץ לא נמצא"
+
 #~ msgid "position"
 #~ msgstr "מיקום"
@@ -27032,6 +27109,15 @@
 #~ msgstr "שונה"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "בחר שורה להעתקה"
+
 #~ msgid "Navigation"
 #~ msgstr "ניווט"
+
+#~ msgid "requested: {0}"
+#~ msgstr "התבקש: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "שגיאה בבקשת עדכון"
 
 #~ msgid "Please select some data"
@@ -27084,6 +27170,12 @@
 #~ msgstr "ייבא קובץ TCX כמסלולי GPS"
 
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
+
 #~ msgid "Validate"
 #~ msgstr "בדוק תקינות"
+
+#~ msgid "Request Update"
+#~ msgstr "בקש עדכון"
 
 #~ msgid "Public"
@@ -27098,4 +27190,11 @@
 #~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית."
 
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
+#~ "התצורה 'pluginmanager.warntime')."
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "לא יכול להוריד תוסף: {0} מ{1}"
@@ -27124,4 +27223,7 @@
 #~ msgid "Basic"
 #~ msgstr "בסיסי"
+
+#~ msgid "zoom"
+#~ msgstr "מיקוד"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -27205,4 +27307,10 @@
 #~ msgstr "התגלתה התנגשות"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "העלאה ל-API של OSM נכשלה"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "יחס מתנגש"
+
 #~ msgid "nodes"
 #~ msgstr "נקודות"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 18508)
+++ applications/editors/josm/i18n/po/is.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 16:06+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-16 14:58+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@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 "Villa"
@@ -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"
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -456,5 +457,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
@@ -496,5 +497,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
@@ -503,6 +504,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"
@@ -688,5 +690,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
@@ -699,5 +701,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"
@@ -769,5 +771,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
@@ -775,28 +785,28 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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}"
@@ -833,10 +843,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 "Vista sem 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 "Vista gögnin í GPX sniði."
@@ -849,11 +859,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
@@ -884,5 +893,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
@@ -897,17 +905,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
@@ -967,5 +976,5 @@
 msgstr "Tengir endahnút á vegi við nálægan veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr ""
@@ -996,20 +1005,19 @@
 msgstr "Veldu minnst tvo hnúta til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Hætti við..."
-
-#: ../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 "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1150,7 +1158,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Sæki gögn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1297,10 +1304,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 "Vista"
 
 #: ../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 "Vista þau gögn sem sjást núna."
@@ -1355,10 +1362,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 "Vista sem..."
 
 #: ../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 "Vista þau gögn sem sjást núna í nýja skrá."
@@ -1400,25 +1407,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 "Loka"
 
-#: ../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 "Skipta veg"
 
-#: ../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 "Skipta veg á völdum hnút(um)."
 
-#: ../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 ""
 
-#: ../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."
@@ -1430,5 +1437,5 @@
 "hnúta eða hnúta á enda vegs."
 
-#: ../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 "
@@ -1444,9 +1451,9 @@
 "veginn sem þú vilt skipta."
 
-#: ../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 "Valdir hnútar eru ekki hluti af sama veg"
 
-#: ../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."
@@ -1454,10 +1461,10 @@
 msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
 
-#: ../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 "Þú verður að velja tvo eða fleiri hnúta til að skipta hringlaga veg."
 
-#: ../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 "
@@ -1465,5 +1472,5 @@
 msgstr ""
 
-#: ../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 "
@@ -1471,5 +1478,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 "
@@ -1477,5 +1484,5 @@
 msgstr ""
 
-#: ../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"
@@ -1505,47 +1512,47 @@
 msgstr "Skipta upp hnút sem er notaður af mörgum vegum."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+msgid "The current selection cannot be used for unglueing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+msgid "Select either:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+msgid "* One tagged node, or"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "* One node that is used by more than one way, or"
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "The current selection cannot be used for unglueing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "Select either:"
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+
+#: ../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."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One tagged node, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid "* One node that is used by more than one way, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1555,9 +1562,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1565,5 +1572,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"
@@ -1604,12 +1611,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum"
+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 ""
@@ -1625,6 +1631,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Uppfæra val"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1638,10 +1645,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 "Afrita valda hluti á klemmuborðið."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "búa til nýja hluti"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1786,7 +1799,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Hleð upp gögnum ..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1908,9 +1921,9 @@
 msgstr "Niðurhöluð GPX gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Sæki gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1918,5 +1931,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 "Engin gögn fundust á þessu svæði."
@@ -1932,16 +1945,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Notandanafn."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} hlutur var fjarlægður úr gögnunum þínum því honum hefur verið eytt á "
-"þjóninum."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -1951,7 +1960,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Hætta við að hala upp og halda áfrám að breyta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1980,7 +1988,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Villa við að spila hljóð"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1994,5 +2001,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
@@ -2023,6 +2030,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 ""
@@ -2040,26 +2047,26 @@
 msgstr "Bæta hnút við veg"
 
-#: ../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 ""
 
-#: ../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 "Bætti hnút við veg sem til var fyrir"
 
-#: ../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 ""
 
-#: ../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 "Búa til nýjan hnút."
 
-#: ../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 ""
 
-#: ../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."
@@ -2068,46 +2075,42 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Búa til svæði"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../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 ""
-
-#: ../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:422
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr ""
 
@@ -2162,7 +2165,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
@@ -2189,51 +2200,54 @@
 msgstr ""
 
-#: ../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 "Leita..."
 
-#: ../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 "Leita að hlutum."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Sláðu inn leitarstreng"
 
-#: ../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 "regluleg segð"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "skipta út vali"
 
-#: ../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 "bæta við val"
 
-#: ../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 "fjarlæga úr vali"
 
-#: ../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 "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regluleg segð"
 
-#: ../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 ""
@@ -2241,18 +2255,18 @@
 "gildi."
 
-#: ../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>\"Gamla Hringbraut\"</b> - „Gamla Hringbraut“ í einhverjum lykli og gildi."
 
-#: ../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:Gam</b> - „Gam“ kemur fyrir í nafninu."
 
-#: ../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> - lykilinn „type“ með gildið „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>, "
@@ -2262,17 +2276,17 @@
 "<b>*=gildi</b>, <b>type=</b>, <b>*=*</b> og <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:Gam</b> - „Gam“ kemur ekki fyrir í nafninu."
 
-#: ../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> - Lykillinn „foot“ með eitthvað gildi."
 
-#: ../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>Sérleitir:</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>)"
@@ -2281,54 +2295,53 @@
 "fyrir hnút, veg og vensl"
 
-#: ../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>user:</b>... - Hlutir sem breytt hefur verið af gefnum notanda"
 
-#: ../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 "<b>id:</b>... - hlutur með þessa kennitölu (0 fyrir nýja hluti)"
 
-#: ../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>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
 
-#: ../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>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
-
-#: ../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> - Hlutum sem breytt hefur verið"
 
-#: ../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> - Valdir hlutir"
 
-#: ../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> - Ókláraðir hlutir"
 
-#: ../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>untagged</b> - Hlutir án eiginda"
 
-#: ../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 "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
 
-#: ../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 "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
 
-#: ../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 "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
 
-#: ../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 ""
@@ -2336,9 +2349,9 @@
 "„:“ eða „ “"
 
-#: ../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 "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
 
-#: ../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
@@ -2348,51 +2361,51 @@
 msgstr ""
 
-#: ../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 "Leit"
 
-#: ../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 "Hefja leit"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr "stafsetursónæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2560,6 +2573,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
@@ -2684,5 +2697,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 ""
@@ -2708,4 +2721,7 @@
 
 #: ../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"
@@ -2741,5 +2757,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 ""
@@ -2747,6 +2763,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."
@@ -2758,5 +2774,5 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2767,5 +2783,15 @@
 msgstr ""
 
-#: ../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"
@@ -2847,5 +2873,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"
@@ -2950,8 +2976,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
 msgid "Illegal double value ''{0}''"
-msgstr "Ógild regluleg segð \"{0}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3131,5 +3163,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
@@ -3143,5 +3175,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 ""
@@ -3149,4 +3181,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3204,32 +3272,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Villa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Viðvörun: {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 ""
 
@@ -3254,45 +3323,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected, got {1}"
+msgstr ""
+
+#: ../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
@@ -3303,6 +3355,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 ""
 
@@ -3313,145 +3366,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Óþekkt hlutverk \"{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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Villa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Viðvörun: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr ""
 
-#: ../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
@@ -3461,5 +3514,5 @@
 msgstr[1] "hnútar"
 
-#: ../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
@@ -3469,6 +3522,6 @@
 msgstr[1] "vegir"
 
-#: ../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
@@ -3478,13 +3531,13 @@
 msgstr[1] "vensl"
 
-#: ../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 ""
 
-#: ../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 "ókláraður vegur"
 
-#: ../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
@@ -3492,5 +3545,5 @@
 msgstr "bakgrunnur"
 
-#: ../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 ""
@@ -3569,5 +3622,5 @@
 msgstr "Ekki sýna þessi skilaboð aftur"
 
-#: ../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
@@ -3575,32 +3628,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 "óklárað"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr ""
 
-#: ../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"
@@ -3609,5 +3662,5 @@
 msgstr[1] "{0} hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3616,33 +3669,33 @@
 msgstr[1] "{0} stök"
 
-#: ../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
@@ -3650,9 +3703,9 @@
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3674,7 +3727,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Loka þessum glugga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3864,5 +3916,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 "Breyta"
@@ -3988,10 +4040,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 ""
 
-#: ../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"
@@ -4120,5 +4172,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"
@@ -4127,5 +4179,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"
@@ -4135,5 +4187,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 "Stök"
@@ -4562,5 +4614,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 ""
@@ -4618,6 +4670,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 "<óskilgreint>"
@@ -4746,4 +4796,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"
@@ -4840,5 +4891,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"
@@ -4849,5 +4900,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"
@@ -4870,7 +4921,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Raða völdum meðlimum eða öllum listanum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -4889,7 +4939,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Vistar hlutverk fyrir völd stök"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4909,7 +4958,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Upphal <strong>mistókst</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -4976,5 +5024,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
@@ -5068,5 +5116,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"
@@ -5122,11 +5170,11 @@
 msgstr "Sýna breytingarsögu valdra hluta."
 
-#: ../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
@@ -5134,13 +5182,13 @@
 msgstr "Endurhlaða"
 
-#: ../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 "Endurhlaða breytingaskrálistann með núverandi vali."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Sýna"
 
-#: ../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 ""
@@ -5197,7 +5245,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] "Allt að {0} hluti verður breytt."
@@ -5205,5 +5252,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 "Tómt gildi eyðir lyklinum"
 
@@ -5228,4 +5276,11 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
+#: ../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] "Allt að {0} hluti verður breytt."
+msgstr[1] "Allt að {0} hlutum verður breytt."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5302,60 +5357,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 "Vensl"
 
-#: ../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 "Sýna lista yfir vensl"
 
-#: ../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 "Vensl: {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 "Opna ritil til að breyta völdum venslum"
 
-#: ../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 "Eyða völdum venslum"
 
-#: ../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 "Skapa ný vensl"
 
-#: ../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 "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
 
-#: ../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 "Eyða völdum venslum"
-
-#: ../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 "Velja skráarnafn"
-
-#: ../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 "Eyða völdum venslum"
-
-#: ../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 "Niðurhala meðlimum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5514,5 +5565,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}"
@@ -5754,18 +5805,19 @@
 msgstr "Breyta venslunum sem valið stak bendir á"
 
-#: ../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
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
+msgstr "Breyta venslunum sem valið stak bendir á"
+
+#: ../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 ""
@@ -5788,5 +5840,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}"
@@ -5868,12 +5920,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Búa til svæði"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Loka breytingarsettinu sem nú er valið"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5884,7 +5934,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 "Sláðu inn nafn fyrir staðsetningu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5894,12 +5943,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Færa valda meðlimi upp"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Færa valda meðlimi upp"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5959,7 +6006,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Skipta veg á völdum hnút(um)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5968,7 +6014,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5992,7 +6037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Eyða völdu lagi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6009,12 +6053,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Loka breytingarsettinu sem nú er valið"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Veldu hlut til að breyta fyrst."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6030,7 +6072,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Sláðu inn nafn á stað til að leita að"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6044,7 +6085,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Leita..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6978,7 +7018,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "nálægt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7023,5 +7062,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 ""
@@ -7035,5 +7074,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 ""
@@ -7044,5 +7083,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 ""
@@ -7051,19 +7090,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 ""
@@ -7073,32 +7112,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 ""
@@ -7120,37 +7159,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 "Loka þessum glugga"
 
-#: ../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 ""
@@ -7158,5 +7197,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 ""
@@ -7164,9 +7203,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 ""
@@ -7175,24 +7214,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr ""
+
+#: ../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}"
@@ -7205,4 +7254,22 @@
 msgstr "Hnútur {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Þysja að vandamálinu"
+
+#: ../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 "sagnfræði"
+
+#: ../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
@@ -7215,17 +7282,66 @@
 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
+msgid "not present"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "óskilgreint"
+
+#: ../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 "Nafnlaust"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7250,4 +7366,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Útgáfa {0} búin til {1} af {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "Fjarlægja"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Útgáfa {0} búin til {1} af {2}"
 
@@ -7592,9 +7723,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] "{0} hlut verður breytt:"
-msgstr[1] "{0} hlutum verður breytt:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7678,13 +7809,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 "Niðurhala lista yfir opin breytingarsett frá þjóninum"
 
-#: ../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 "Loka breytingarsettinu sem nú er valið"
 
-#: ../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
@@ -7755,5 +7886,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}..."
@@ -7765,5 +7896,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 ""
@@ -7789,5 +7920,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"
@@ -7842,43 +7973,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 ""
 
 #: ../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 "Sérsníða teikningu lína"
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 "Sérsníða liti"
 
 #: ../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"
@@ -7886,6 +8017,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"
@@ -7975,10 +8106,10 @@
 msgstr[1] "{0} punktar"
 
-#: ../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 "Breyta í gagnalag"
 
-#: ../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."
@@ -7986,43 +8117,43 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8031,9 +8162,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8041,5 +8172,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8073,5 +8204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8082,9 +8213,5 @@
 "server."
 msgstr[0] ""
-"{0} hlutur var fjarlægður úr gögnunum þínum því honum hefur verið eytt á "
-"þjóninum."
 msgstr[1] ""
-"{0} hlutir voru fjarlægðir úr gögnunum þínum því þeim hafði verið eytt á "
-"þjóninum."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8103,33 +8230,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} hnútur"
-msgstr[1] "{0} hnútar"
-
-#: ../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 "Tölfræði um {0}:"
 
-#: ../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 útgáfa: {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 "Breyta í GPX-lag"
 
-#: ../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."
@@ -8137,5 +8264,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"
@@ -8144,5 +8271,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"
@@ -8150,5 +8277,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8157,5 +8284,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8164,5 +8291,5 @@
 msgstr[1] "{0} samanstendur af {1} ferlum"
 
-#: ../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"
@@ -8171,9 +8298,9 @@
 msgstr[1] ""
 
-#: ../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 punktur"
 
-#: ../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"
@@ -8181,5 +8308,5 @@
 msgstr[1] "punktar"
 
-#: ../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"
@@ -8188,14 +8315,14 @@
 msgstr[1] "{0} samanstendur af {1} punktum"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -8203,14 +8330,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8218,13 +8345,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Sýna/Fela texta og táknmyndir"
 
-#: ../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 ""
@@ -8288,5 +8415,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 "Veldu hlut til að breyta fyrst."
@@ -8300,5 +8427,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."
@@ -9014,12 +9141,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Fjarlægja völd stök úr þessum venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9033,22 +9158,19 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Bæta við nýju taggi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Loka völdum breytingarsettum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Eyða völdum venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Hleð upp gögnum úr laginu „{0}“"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
@@ -9655,5 +9777,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}''."
@@ -9680,5 +9802,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}."
@@ -9686,5 +9808,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}"
@@ -9697,5 +9819,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}''."
@@ -9847,5 +9969,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9854,38 +9976,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 ""
@@ -9893,19 +10015,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 ""
 
-#: ../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 "Ógildur hlutur með kenni=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 ""
@@ -9916,9 +10038,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 ""
@@ -9928,25 +10050,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 ""
@@ -9954,5 +10076,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9961,5 +10083,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9967,5 +10089,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9974,13 +10096,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 "Undirbý OSM gögn..."
 
-#: ../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 "Undirbý gögn..."
@@ -10131,13 +10253,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] ""
-"Náð var í {0} viðbót. Vinsamlegast endurræstu JOSM til að nota nýju "
-"viðbótina."
 msgstr[1] ""
-"Náð var í {0} viðbætur. Vinsamlegast endurræstu JOSM til að nota nýju "
-"viðbæturnar."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10148,5 +10266,5 @@
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr "Sæki íforrit {0}..."
+msgstr "Sæki viðbótina {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
@@ -10199,7 +10317,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Uppfæra viðbætur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10338,35 +10455,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 "óskilgreint"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10987,47 +11073,46 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Færa valið lag upp í röðinni"
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11043,24 +11128,24 @@
 msgstr ""
 
-#: ../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 skrár (*.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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11069,34 +11154,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11104,69 +11189,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11175,9 +11260,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11186,65 +11271,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11252,13 +11337,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11279,5 +11364,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11290,37 +11375,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11332,18 +11417,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11370,34 +11455,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11409,18 +11494,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11428,5 +11513,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11434,74 +11519,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11509,30 +11594,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11540,29 +11625,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11571,13 +11656,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"
@@ -11585,5 +11670,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"
@@ -11591,14 +11676,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"
@@ -11606,14 +11691,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"
@@ -11621,64 +11706,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Bæta við nýju lagi"
 
-#: ../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 ""
 
-#: ../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 "
@@ -11686,25 +11771,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11714,14 +11799,14 @@
 msgstr[1] "Einfalda veg (fjarlægja {0} hnúta)"
 
-#: ../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 ""
 
-#: ../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"
@@ -11729,5 +11814,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
@@ -11735,5 +11820,5 @@
 msgstr ""
 
-#: ../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"
@@ -11741,34 +11826,34 @@
 msgstr ""
 
-#: ../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 "Tómt lag"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11777,18 +11862,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11895,9 +11980,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11914,11 +11999,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 ""
 
 #: ../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 ""
@@ -11928,5 +12013,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 ""
@@ -12136,5 +12221,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12556,5 +12641,5 @@
 msgstr "Hornið milli tveggja valinna nóða"
 
-#: ../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 "Lag ætlað til mælinga"
@@ -12633,5 +12718,5 @@
 msgstr ""
 
-#: ../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 "Sýna OpenStreetBugs pöddur"
@@ -12764,7 +12849,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Lag"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12928,43 +13012,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 "Gagnvirkt kort"
 
-#: ../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 "Þysja"
-
-#: ../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 ""
 
-#: ../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 "Skoða notandasíðu"
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13000,7 +13082,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Þysjun á lag"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13346,6 +13427,6 @@
 msgstr ""
 
-#: ../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
@@ -13353,5 +13434,5 @@
 msgstr "Villur sem fundust við athugun"
 
-#: ../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 "Engar villur fundust við athugun"
@@ -13438,5 +13519,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13536,7 +13617,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "strandlengja"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13566,18 +13646,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13729,80 +13809,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13810,86 +13890,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14064,17 +14144,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14125,13 +14205,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14167,7 +14247,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 "Eyði lagi {0} af {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14175,61 +14255,64 @@
 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 "Niðurhala"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Niðurhala kortagögnum frá OSM þjóninum."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Hnútur endurtekinn í vegi"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14332,28 +14415,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14364,55 +14447,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../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 "Vista WMS lag í skrá"
 
-#: ../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 "Hlaða WMS lag úr skrá"
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -18834,14 +18917,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Fornleifasvæði"
+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 "Breyti fornleifasvæði"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26810,12 +26891,261 @@
 msgstr ""
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Óvistaðar breytingar"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
+#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
+
+#~ msgid "File not found"
+#~ msgstr "Skrá fannst ekki"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Opna í vafra"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM vefhjálp"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Óþekkt skráarending"
+
 #~ msgid "File could not be found."
 #~ msgstr "Skrá fannst ekki."
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
+#~ "reyna síðar."
+
+#~ msgid "Unknown version"
+#~ msgstr "Óþekkt útgáfa"
+
+#~ msgid "name"
+#~ msgstr "nafn"
+
+#~ msgid "Email"
+#~ msgstr "Netfang"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Aðeins einn hnútur valinn"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Bæta völdum hlutum við venslin"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Sláðu inn leitarstreng"
+
+#~ msgid "unnamed"
+#~ msgstr "ónefnt"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Árekstrar: {0}"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} hlutur hefur árekstra:"
+#~ msgstr[1] "{0} hlutir hafa árekstra:"
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Vensl rekast á"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir "
+#~ "það?"
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "Upphala til OSM..."
+
+#~ msgid "sports"
+#~ msgstr "íþróttir"
+
+#~ msgid "Update Data"
+#~ msgstr "Uppfæra gögn"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Illa-formað kenni á hnút"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt "
+#~ "fyrir það?"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Veldu fyrst bókmerki"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Fjarlægja val"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Sláðu inn hnitin fyrst"
+
+#~ msgid "zoom"
+#~ msgstr "þysja"
+
+#~ msgid "Revert"
+#~ msgstr "Afturkalla"
+
+#~ msgid "History of Element"
+#~ msgstr "Breytingaskrá hluts"
+
+#~ msgid "Validate"
+#~ msgstr "Athuga"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Athuga núverandi val eða öll gögn í laginu."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Breytingarárekstrar."
+
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
+
+#~ msgid "Data Layer"
+#~ msgstr "Gagnalag"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Nota forstillinguna „{0}“"
+
+#~ msgid "Occupied By"
+#~ msgstr "Gengt af"
+
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr ""
+#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á "
+#~ "openstreetmap.org"
+
+#~ msgid "Public"
+#~ msgstr "Sýnilegur öllum"
+
+#~ msgid "Charge"
+#~ msgstr "Gjaldtaka"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Breyti upplýsingamiðstöð"
+
+#~ msgid "Board Type"
+#~ msgstr "Viðfangsefni skiltisins"
+
+#~ msgid "Map Type"
+#~ msgstr "Gerð korts"
+
+#~ msgid "bicyclemap"
+#~ msgstr "hjólakort"
+
+#~ msgid "citymap"
+#~ msgstr "borgarkort"
+
+#~ msgid "hikingmap"
+#~ msgstr "göngukort"
+
+#~ msgid "map"
+#~ msgstr "kort"
+
+#~ msgid "nodes"
+#~ msgstr "hnútar"
+
+#~ msgid "Move Up"
+#~ msgstr "Færa upp"
+
+#~ msgid "Move Down"
+#~ msgstr "Færa niður"
+
+#~ msgid "Sort"
+#~ msgstr "Raða"
+
+#~ msgid "Members: {0} (linked: {1})"
+#~ msgstr "Stök: {0} (tengd: {1})"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Veldu hlut til að afrita fyrst."
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst."
+
+#~ msgid "No data imported."
+#~ msgstr "Ekki var náð í nein gögn"
+
+#~ msgid "Combine Anyway"
+#~ msgstr "Sameina þá"
+
+#~ msgid "Do you really want to delete layer ''{0}''?"
+#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Opna nýtt breytingarsett og loka því strax"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr "Nota opið breytingarsett #{0} og loka því"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé "
+#~ "að bæta við frekari breytingum síðar meir"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
+#~ msgstr ""
+#~ "Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að "
+#~ "breytingunni hefur verið upphlaðið"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið "
+#~ "svo hægt sé að bæta við frekari breytingum síðar meir"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Endurhlaða vallistann"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
 
 #~ msgid ""
@@ -26826,255 +27156,6 @@
 #~ "<br>Eyða úr venslunum?</html>"
 
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
-
-#~ msgid "File not found"
-#~ msgstr "Skrá fannst ekki"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Sláðu inn hnitin fyrst"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Veldu fyrst bókmerki"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Sláðu inn leitarstreng"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
-
-#~ msgid "name"
-#~ msgstr "nafn"
-
-#~ msgid "zoom"
-#~ msgstr "þysja"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Veldu hlut til að afrita fyrst."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Óvistaðar breytingar"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
-#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Opna í vafra"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM vefhjálp"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Óþekkt skráarending"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
-#~ "reyna síðar."
-
-#~ msgid "Unknown version"
-#~ msgstr "Óþekkt útgáfa"
-
-#~ msgid "Email"
-#~ msgstr "Netfang"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Aðeins einn hnútur valinn"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Bæta völdum hlutum við venslin"
-
-#~ msgid "unnamed"
-#~ msgstr "ónefnt"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Árekstrar: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} hlutur hefur árekstra:"
-#~ msgstr[1] "{0} hlutir hafa árekstra:"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir "
-#~ "það?"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Upphala til OSM..."
-
-#~ msgid "sports"
-#~ msgstr "íþróttir"
-
-#~ msgid "Update Data"
-#~ msgstr "Uppfæra gögn"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Illa-formað kenni á hnút"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt "
-#~ "fyrir það?"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Fjarlægja val"
-
-#~ msgid "Revert"
-#~ msgstr "Afturkalla"
-
-#~ msgid "History of Element"
-#~ msgstr "Breytingaskrá hluts"
-
-#~ msgid "Validate"
-#~ msgstr "Athuga"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Athuga núverandi val eða öll gögn í laginu."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Breytingarárekstrar."
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
-
-#~ msgid "Data Layer"
-#~ msgstr "Gagnalag"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Nota forstillinguna „{0}“"
-
-#~ msgid "Occupied By"
-#~ msgstr "Gengt af"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á "
-#~ "openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Sýnilegur öllum"
-
-#~ msgid "Charge"
-#~ msgstr "Gjaldtaka"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Breyti upplýsingamiðstöð"
-
-#~ msgid "Board Type"
-#~ msgstr "Viðfangsefni skiltisins"
-
-#~ msgid "Map Type"
-#~ msgstr "Gerð korts"
-
-#~ msgid "bicyclemap"
-#~ msgstr "hjólakort"
-
-#~ msgid "citymap"
-#~ msgstr "borgarkort"
-
-#~ msgid "hikingmap"
-#~ msgstr "göngukort"
-
-#~ msgid "map"
-#~ msgstr "kort"
-
-#~ msgid "nodes"
-#~ msgstr "hnútar"
-
-#~ msgid "Move Up"
-#~ msgstr "Færa upp"
-
-#~ msgid "Move Down"
-#~ msgstr "Færa niður"
-
-#~ msgid "Sort"
-#~ msgstr "Raða"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Stök: {0} (tengd: {1})"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst."
-
-#~ msgid "No data imported."
-#~ msgstr "Ekki var náð í nein gögn"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sameina þá"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Opna nýtt breytingarsett og loka því strax"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr "Nota opið breytingarsett #{0} og loka því"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé "
-#~ "að bæta við frekari breytingum síðar meir"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að "
-#~ "breytingunni hefur verið upphlaðið"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið "
-#~ "svo hægt sé að bæta við frekari breytingum síðar meir"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Endurhlaða vallistann"
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
 
 #~ msgid "Display the history of the selected primitive."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 18508)
+++ applications/editors/josm/i18n/po/it.po	(revision 18656)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-10-30 17:45+0000\n"
-"Last-Translator: Stefano Pallicca <pallicca@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-11 16:14+0000\n"
+"Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,18 +44,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
@@ -65,6 +65,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
@@ -72,11 +71,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
@@ -91,4 +90,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"
@@ -115,6 +115,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
@@ -130,7 +130,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
@@ -141,7 +141,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
@@ -167,12 +167,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
@@ -184,6 +184,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 "Errore"
@@ -204,6 +205,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"
@@ -317,5 +318,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
@@ -333,6 +334,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
@@ -343,5 +344,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
@@ -461,5 +462,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
@@ -501,5 +502,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
@@ -508,6 +509,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"
@@ -695,5 +697,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
@@ -706,5 +708,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"
@@ -778,5 +780,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
@@ -784,28 +794,28 @@
 msgstr "il parametro ''{0}'' non deve essere nullo"
 
-#: ../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 "Ci sono stati {0} conflitti durante l'importazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Conflitti durante lo scaricamento"
 
-#: ../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 "({0}/{1}) Caricamento degli elementi da cui dipende il nodo {2}"
 
-#: ../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 "({0}/{1}) Caricamento degli elementi da cui dipende il percorso {2}"
 
-#: ../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}"
@@ -842,10 +852,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 "Esporta in 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 "Esporta i dati in un file GPX."
@@ -858,11 +868,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
@@ -893,5 +902,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
@@ -906,17 +914,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
@@ -978,5 +987,5 @@
 msgstr "Unisci un nodo al percorso più vicino"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Unisci il nodo e il percorso"
@@ -997,5 +1006,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
-msgstr "Fondi nodi"
+msgstr "Unisci nodi"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
@@ -1007,20 +1016,21 @@
 msgstr "Seleziona almeno due nodi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Interruzione in corso"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr "Annulla unione"
+
+#: ../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
+msgstr "Cliccare per annullare l'unione dei nodi"
+
+#: ../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 "Impossibile unire i nodi. Cancellare un percorso attualmente usato."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+"Impossibile unire i nodi: si dovrebbe eliminare il percorso ''{0}'', il "
+"quale è ancora utilizzato."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1161,5 +1171,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
 msgstr "Scarica dati"
@@ -1315,10 +1324,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 "Salva"
 
 #: ../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 "Salva i dati attuali."
@@ -1375,10 +1384,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 "Salva come..."
 
 #: ../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 "Salva i dati correnti su un nuovo file."
@@ -1422,25 +1431,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 "Chiudi"
 
-#: ../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 "Dividi percorso"
 
-#: ../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 "Divide un percorso al nodo selezionato."
 
-#: ../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 "La selezione attuale non può essere usata per la divisione."
 
-#: ../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."
@@ -1448,5 +1457,5 @@
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../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 "
@@ -1462,9 +1471,9 @@
 "percorso."
 
-#: ../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 "I nodi selezionati non condividono il medesimo percorso."
 
-#: ../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."
@@ -1472,10 +1481,10 @@
 msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
 
-#: ../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 "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../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 "
@@ -1485,5 +1494,5 @@
 "seleziona i nodi in mezzo al percorso)."
 
-#: ../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 "
@@ -1494,5 +1503,5 @@
 "necessario.</html>"
 
-#: ../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 "
@@ -1502,5 +1511,5 @@
 "strade<br>Verificare l'operazione e correggere dove necessario.</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"
@@ -1530,38 +1539,38 @@
 msgstr "Duplica i nodi usati da più percorsi."
 
-#: ../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 "Questo nodo non è attaccato ad altri elementi."
 
-#: ../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 "Nessuno di questi nodi è attaccato ad altri elementi."
 
-#: ../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 "Nessun nodo di questo percorso è attaccato ad altri elementi."
 
-#: ../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 "La selezione corrente non può essere utilizzata per la separazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selezionare uno di questi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etichettato, oppure"
 
-#: ../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 "* Un nodo che è usato da più di un percorso, oppure"
 
-#: ../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 ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
 
-#: ../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"
@@ -1570,5 +1579,5 @@
 "oppure"
 
-#: ../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."
@@ -1577,5 +1586,5 @@
 "percorso."
 
-#: ../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"
@@ -1590,9 +1599,9 @@
 "e tutti i nodi saranno selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nodo staccato"
 
-#: ../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"
@@ -1600,5 +1609,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"
@@ -1639,13 +1648,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr ""
-"Aggiorna gli oggetti nel livello corrente dei dati prelevandoli dal server."
+msgstr "Aggiorna gli oggetti nel livello dei dati attivo dal server."
 
 #. 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 "Scarica dati"
@@ -1662,5 +1669,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Aggiorna le selezioni"
 
@@ -1677,5 +1685,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento."
 
@@ -1683,4 +1692,9 @@
 msgid "Selection empty"
 msgstr "Selezione vuota"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Elimina oggetti"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1690,7 +1704,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-#, fuzzy
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr "Carica tutte le modifiche nel livello corrente dei dati sul server OSM"
+msgstr ""
+"Carica tutte le modifiche presenti nel livello dei dati attivo sul server OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1840,30 +1854,30 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare "
-"questa primitiva e riprovare a caricare."
+"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto "
+"questo oggetto e riprovo a caricare."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare "
-"questa primitiva e riprovare a caricare."
+"L''oggetto ''''{0}'''' è già eliminato. Salto l''oggetto durante il "
+"caricamento."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Caricamento dati ..."
+msgstr "Caricamento di {0} oggetti ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"L''eccezione verrà ignorata perché lo scaricamento è stato annullato. "
-"Eccezione: {0}"
+"L''eccezione che è stata generata verrà ignorata perché il caricamento è "
+"stato annullato. L''eccezione è: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1980,9 +1994,9 @@
 msgstr "Scarica dati GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Scaricamento dei dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1992,5 +2006,5 @@
 "Eccezione: {0}"
 
-#: ../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 "Non è stato trovato alcun dato in quest'area."
@@ -2006,16 +2020,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "visibile (sul server)"
+msgstr "Controllo sul server"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} oggetto è stato epurato dall''insieme di dati locale perché risulta "
-"eliminato dal server."
+"Cliccare per controllare se qualche oggetto nel proprio insieme di dati è "
+"stato eliminato sul server"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2025,7 +2037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Cliccare per annullare e per ritornare alla modifica della mappa"
+msgstr "Cliccare per annullare e per riprendere le modifiche"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2050,8 +2061,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
 msgstr ""
-"Sono stati generati i seguenti errori durante lo scaricamento massivo:{0}"
+"Sono stati generati i seguenti errori durante lo scaricamento di massa: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2061,7 +2072,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Errori durante lo scaricamento"
+msgstr "Errore durante lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2075,5 +2085,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
@@ -2107,6 +2117,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 "selezionato"
@@ -2124,26 +2134,26 @@
 msgstr "Aggiungi un nodo al percorso"
 
-#: ../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 "Collega un percorso esistente al nodo"
 
-#: ../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 "Aggiungi un nodo ad un percorso esistente"
 
-#: ../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 "Aggiungi un nodo al percorso e connetti"
 
-#: ../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 "Crea un nuovo nodo."
 
-#: ../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 "Seleziona il nodo sotto il cursore."
 
-#: ../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."
@@ -2152,50 +2162,48 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../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 "Inizia un nuovo percorso dall'ultimo nodo."
 
-#: ../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 "Continua un percorso dall'ultimo nodo."
 
-#: ../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 "Termina tracciamento."
 
-#: ../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 "Estrudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Crea aree"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Estrudi il percorso"
 
-#: ../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 ""
-"Rilascia il bottone del mouse per selezionare gli oggetti contenuti nel "
-"rettangolo."
-
-#: ../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 ""
 "Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone "
 "del mouse."
 
-#: ../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 "Rilascia il bottone del mouse per interrompere la rotazione."
-
-#: ../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 ""
+"Disegna un rettangolo della grandezza desiderata, poi rilascia il bottone "
+"del mouse."
+
+#: ../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 ""
 "Trascina il segmento un segmento di un percorso per disegnare un rettangolo."
@@ -2258,4 +2266,10 @@
 msgstr "Sposta sempre e non visualizzare più la finestra di dialogo"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+"Rilascia il bottone del mouse per selezionare gli oggetti contenuti nel "
+"rettangolo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2264,4 +2278,8 @@
 "Rilasciare il pulsante del mouse per fermarsi. Ctrl per unire con il nodo "
 "più vicino."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2293,70 +2311,73 @@
 "di ingrandimento con il tasto destro"
 
-#: ../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 "Cerca..."
 
-#: ../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 "Cerca degli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati."
-
-#: ../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 "Inserire una stringa di filtro."
 
-#: ../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 "Inserire una stringa di ricerca."
 
-#: ../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 "espressione regolare"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "Sostituisci la selezione"
 
-#: ../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 "Aggiungi alla selezione"
 
-#: ../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 "Rimuovi dalla selezione"
 
-#: ../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 "cerca nella selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "Distingui maiuscole"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "espressione regolare"
 
-#: ../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>Via Nazionale</b> - ''Via'' e ''Nazionale'' in qualunque chiave o nome."
 
-#: ../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>\"Via Nazionale\"</b> - ''Via Nazionale'' in qualunque chiave o nome."
 
-#: ../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:Naz</b> - ''Naz'' in qualunque punto del nome."
 
-#: ../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> - chiave 'type' che contiene esattamente il valore '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>, "
@@ -2366,17 +2387,17 @@
 "<b>*=value</b>, <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:Naz</b> - ''Naz'' non presente all''interno del nome."
 
-#: ../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> - chiave=foot impostata con qualunque valore."
 
-#: ../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>Ricerche speciali:</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>)"
@@ -2384,40 +2405,41 @@
 "<b>type:</b> - tipo dell''oggetto (<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>user:</b>... - tutti gli oggetti modificati dall''utente"
 
-#: ../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 "<b>id:</b>... - oggetto con un dato ID (0 per nuovi oggetti)"
 
-#: ../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>... - oggetto con un dato numero di nodi"
 
-#: ../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>... - oggetto con un dato numero di nodi"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgstr ""
+"<b>tags:</b>... - oggetto con un dato numero di etichette (tags:numero di "
+"etichette:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tutti gli oggetti modificati"
 
-#: ../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> - tutti gli oggetti selezionati"
 
-#: ../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> - tutti gli oggetti incompleti"
 
-#: ../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>untagged</b> - tutti gli oggetti provi di proprietà"
 
-#: ../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"
@@ -2426,5 +2448,5 @@
 "corrispondenti all'espressione"
 
-#: ../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"
@@ -2433,5 +2455,5 @@
 "oggetti corrispondenti all'espressione"
 
-#: ../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 ""
@@ -2439,5 +2461,5 @@
 "logico ''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 ""
@@ -2445,9 +2467,9 @@
 "contiene :)"
 
-#: ../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 "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
 
-#: ../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
@@ -2457,33 +2479,33 @@
 msgstr "Filtro"
 
-#: ../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 "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Invia filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Inizia Ricerca"
 
-#: ../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 "Nessuna corrispondenza trovata per ''{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 "Nulla è stato aggiunto alla selezione cercando ''{0}''"
 
-#: ../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 "Nulla è stato rimosso dalla selezione cercando ''{0}''"
 
-#: ../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}''"
@@ -2491,18 +2513,18 @@
 "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''"
 
-#: ../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 "Trovate {0} corrispondenze"
 
-#: ../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"
@@ -2556,16 +2578,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Numero errato di parametri per operatore sui nodi."
+msgstr "Numero errato di parametri per l'operatore tags."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Valore non corretto per l''operatore sui nodi: {0}. L'operatore sui nodi "
-"richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
+"Valore non corretto per l''operatore tags: {0}. L''operatore tags richiede "
+"il numero di etichette o un intervallo, per esempio tags:1 oppure tags:2-5"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2692,6 +2713,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
@@ -2820,5 +2841,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 ""
@@ -2837,16 +2858,22 @@
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "Cannot resolve undecided conflict."
-msgstr "non è possibile risolvere il conflitto irrisolto"
+msgstr "Impossibile risolvere il conflitto irrisolto"
 
 #: ../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 "il parametro ''{0}'' non deve essere vuoto."
+msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#, fuzzy
+msgid "At least one object to delete required, got empty collection"
+msgstr ""
+"E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota"
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
 msgid "At least one object to delete requird, got empty collection"
 msgstr ""
+"E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
@@ -2879,5 +2906,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 "Dividi il segmento del percorso"
@@ -2885,6 +2912,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."
@@ -2896,5 +2923,5 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Conferma di cancellazione"
@@ -2905,5 +2932,15 @@
 msgstr "Risolvi conflitti nello stato eliminato 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"
@@ -2990,5 +3027,5 @@
 msgstr "Risolvi {0} conflitti di etichette nella relazione {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3089,5 +3126,5 @@
 #, java-format
 msgid "Expected array of length 4, got {0}"
-msgstr ""
+msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
@@ -3095,9 +3132,17 @@
 msgid "Exactly four doubles excpected in string, got {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+"Erano attesi esattamente quattro numeri in doppia precisione nella stringa, "
+"ottenuto {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Valore in doppia precisione ''''{0}'''' non valido"
+
+#: ../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 "Il valore di default è ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3196,4 +3241,5 @@
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr ""
+"Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3202,4 +3248,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
+"''''{1}'''' nel file di segnalibro ''''{2}''''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -3221,4 +3269,6 @@
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
+"Errore: linea ''''{0}'''' non prevista nella lista dei segnalibri "
+"proveniente dal server"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
@@ -3228,4 +3278,6 @@
 "server"
 msgstr ""
+"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
+"''''{1}'''' nella lista dei segnalibri proveniente dal server"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
@@ -3239,9 +3291,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Fallito il caricamento dei segnalibri da ''{0}'' per ragioni di sicurezza. "
-"L''errore è stato: {1}"
+msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3255,8 +3305,10 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Attenzione: numero di versione JOSM non previsto nel file di revisione, il "
+"valore è ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Attenzione: manca il file di revisione ''''/REVISION''''."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
@@ -3300,5 +3352,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
@@ -3311,6 +3363,8 @@
 "Unable to add primitive {0} to the dataset because it's already included"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+"Impossibile aggiungere la primitiva {0} all''insieme di dati perché è già "
+"incluso"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3319,4 +3373,47 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme di dati, "
+"ma non c''è. Si prega di riportare questo errore al sito http://josm."
+"openstreetmap.de . Questo non è un errore critico, si può probabilmente "
+"continuare a lavorare senza problemi."
+
+#: ../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 "Argomento mancante per l'operatore booleano NOT."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Storico per la relazione {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"La mia primitiva con id {0} e versione {1} è visibile sebbene la loro "
+"primitiva con versione minore {2} non lo sia. Non si può sopperire a questa "
+"inconsistenza. Verrà mantenuta la mia primitiva. "
 
 #. translators notes must be in front
@@ -3373,33 +3470,34 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Errore: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Attenzione: {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 "Era atteso ID >= 0. Ottenuto {0}."
 
-#: ../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 "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../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 "Era atteso un ID > 0 . Ottenuto {0}."
 
-#: ../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 "attesa versione > 0 . Ottenuto {0}."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3425,20 +3523,23 @@
 "ci sono chiavi con valori multipli."
 
-#: ../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 "Impossibile aggiungere il nodo {0} al percorso incompleto {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
-
-#: ../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 "Non c'è alcuna versione valida alla data ''{0}'' in questo storico"
-
-#: ../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 "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
@@ -3447,28 +3548,5 @@
 "{1}. Ottenuto ''{2}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr "Nessun tipo trovato. Lo storico è vuoto."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr ""
-"In questo insieme di dati non è stata trovata alcuna primitiva con id {0}"
-
-#: ../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 ""
-"In questo insieme di dati non è stata trovata alcuna primitiva con id {0} e "
-"versione {1}"
-
-#: ../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
@@ -3479,6 +3557,7 @@
 msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Impossibile confrontare la primitiva avente ID ''{0}'' con la primitiva "
@@ -3491,148 +3570,145 @@
 msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
 
-#: ../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 "Il percorso dello stile dell''area non è chiuso."
 
-#: ../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 "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#: ../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 "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../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 "Percorso ''{0}'' con meno di due punti."
 
-#: ../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 "E' stato trovato più di un percorso \"from\"."
 
-#: ../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 "E' stato trovato più di un percorso \"to\"."
 
-#: ../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 "E' stata trovata più di una \"via\"."
 
-#: ../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 "Ruolo ''{0}'' sconosciuto."
 
-#: ../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 "Tipo di membro sconosciuto per ''{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 "Non è stato trovato un percorso \"from\"."
 
-#: ../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 "Non è stato trovato un percorso \"to\"."
 
-#: ../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 "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../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 "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
-#: ../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 "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
-#: ../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 "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../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 "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../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 "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../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 "Intersezione tra i percorsi ''{0}'' e ''{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 "Il percorso interno ''{0}'' è esterno."
 
-#: ../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 "Regola ''{0}'' non utile per il percorso ''{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 "Non-percorso ''{0}'' nel multi-poligono."
 
-#: ../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 "Nessun percorso esterno per il multi-poligono ''{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 "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../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 "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#: ../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 "senza etichetta"
 
-#: ../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 "testo"
 
-#: ../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 "testo dell''area"
 
-#. 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 ""
-"La mia primitiva con id {0} e versione {1} è visibile sebbene la loro "
-"primitiva con versione minore {2} non lo sia. Non si può sopperire a questa "
-"inconsistenza. Verrà mantenuta la mia primitiva. "
-
-#: ../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 "Errore: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Attenzione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inattivo"
 
-#: ../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
@@ -3642,5 +3718,5 @@
 msgstr[1] "nodi"
 
-#: ../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
@@ -3650,6 +3726,6 @@
 msgstr[1] "percorsi"
 
-#: ../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
@@ -3659,13 +3735,13 @@
 msgstr[1] "relazioni"
 
-#: ../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 "percorso senza etichetta"
 
-#: ../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 "percorso incompleto"
 
-#: ../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
@@ -3673,5 +3749,5 @@
 msgstr "sfondo"
 
-#: ../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 "evidenzia"
@@ -3757,5 +3833,5 @@
 msgstr "Non mostrare di nuovo"
 
-#: ../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
@@ -3763,32 +3839,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 "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "strada"
 
-#: ../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 "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "corso d'acqua"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "tipologia di area"
 
-#: ../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"
@@ -3797,5 +3873,5 @@
 msgstr[1] "{0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3804,33 +3880,33 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Violazione della precondizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Eccezione di sicurezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Eccezione di rete"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "Eccezione di IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Richiesta errata"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Non trovato"
 
-#: ../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
@@ -3838,9 +3914,9 @@
 msgstr "Conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Host sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Oggetto eliminato"
@@ -3862,7 +3938,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Chiudi la finestra"
+msgstr "Cliccare per chiudere la finestra"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4067,5 +4142,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 "Modifica"
@@ -4194,10 +4269,10 @@
 msgstr "Utente:"
 
-#: ../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 "livello non in lista."
 
-#: ../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"
@@ -4205,7 +4280,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "No, annulla l'operazione"
+msgstr "Cliccare per annullare l'operazione corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4336,5 +4410,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"
@@ -4343,5 +4417,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"
@@ -4351,5 +4425,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 "Membri"
@@ -4819,5 +4893,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 "No, annulla"
@@ -4861,5 +4935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643
 msgid "Undecide conflict between visible state"
-msgstr "Conflitto senza decisione tra stati di visibilità"
+msgstr "Conflitto irrisolto tra stati di visibilità"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -4882,6 +4956,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 "<indefinito>"
@@ -4933,5 +5005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "Cannot apply undecided tag merge item."
-msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione"
+msgstr "Impossibile marcare come irrisolto l'elemento oggetto di unione"
 
 #. should not happen, but just in case
@@ -4989,7 +5061,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Conflitti durante l''unione dei nodi - il nodo unito è ''''{0}''''"
+msgstr ""
+"Conflitti durante l''unione dei nodi - il nodo di destinazione è ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -5015,4 +5088,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"
@@ -5116,5 +5190,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"
@@ -5125,5 +5199,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"
@@ -5144,14 +5218,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep"
-msgstr ""
+msgstr "Mantieni"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Rimuovi questo membro dalla relazione"
+msgstr "Mantieni questo membro della relazione per l'oggetto in esame"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
-msgstr "Non deciso"
+msgstr "Irrisolto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
@@ -5166,12 +5239,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Imposta un ruolo ai membri selezionati"
+msgstr "Inserire un ruolo per tutte le appartenenze alla relazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Etichette modificate assieme alle relazioni   "
+msgstr "Etichetta le relazioni modificate con "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5180,4 +5251,6 @@
 "modified relations.</html>"
 msgstr ""
+"<html>Selezionare per abilitare l'inserimento di una etichetta che sarà "
+"applicata<br>a tutte le relazioni modificate.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5187,7 +5260,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
+msgstr ""
+"<html>Inserire una chiave per l'etichetta, es. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5199,4 +5273,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Inserire un valore per l'etichetta, es. <strong><tt>controllare i "
+"membri</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5208,4 +5284,9 @@
 "place of the original way in the membership.</html>"
 msgstr ""
+"<html>I percorsi uniti sono membri di una o più relazioni. Decidere se si "
+"desidera <strong>mantenere</strong> queste appartenenze per il percorso "
+"unito oppure se si vuole <strong>rimuoverle</strong>.<br>Il comportamento "
+"predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà il "
+"posto del percorso originale nell'appartenenza.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
@@ -5217,4 +5298,9 @@
 "original node in the membership.</html>"
 msgstr ""
+"<html>I nodi uniti sono membri di una o più relazioni. Decidere se si "
+"desidera <strong>mantenere</strong> queste appartenenze per il nodo di "
+"destinazione oppure se si vuole <strong>rimuoverle</strong>.<br>Il "
+"comportamento predefinito è di <strong>mantenerle</strong>: il nodo di "
+"destinazione prenderà il posto del nodo originale nell'appartenenza.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
@@ -5256,5 +5342,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
@@ -5350,5 +5436,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"
@@ -5404,11 +5490,11 @@
 msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
 
-#: ../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 "Oggetto con storico"
 
-#: ../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
@@ -5416,13 +5502,13 @@
 msgstr "Ricarica"
 
-#: ../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 "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Visualizza"
 
-#: ../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 "Visualizza lo storico degli oggetti selezionati."
@@ -5479,7 +5565,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] "Questo cambierà {0} oggetto."
@@ -5487,5 +5572,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 "Un valore vuoto cancella la chiave."
 
@@ -5510,4 +5596,11 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
+#: ../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] "Questo cambierà {0} oggetto."
+msgstr[1] "Questo cambierà {0} oggetti."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5584,33 +5677,33 @@
 #. 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 "Relazioni"
 
-#: ../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 "Apri tutte le relazioni in una lista"
 
-#: ../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 "Relazioni: {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 "Apri le relazioni selezionate in un editor"
 
-#: ../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 "Cancella le relazioni selezionate"
 
-#: ../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 "Crea una nuova relazione"
 
-#: ../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"
@@ -5618,27 +5711,23 @@
 "Crea una copia di questa relazione e aprila in un'altra finestra dell'editor"
 
-#: ../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 "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
-#: ../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 "Cancella le relazioni selezionate"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
-#, fuzzy
+msgstr "Seleziona i membri di tutte le relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
 msgid "Select members"
-msgstr "Selezionare uno di questi:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
-#, fuzzy
+msgstr "Seleziona membri"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
-msgstr "Scarica le relazioni selezionate"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
-#, fuzzy
+msgstr "Scarica tutti i membri delle relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
-msgstr "Scarica i membri"
+msgstr "Scarica membri"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5805,5 +5894,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}"
@@ -6081,21 +6170,22 @@
 "correntemente selezionato."
 
-#: ../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 "Zoom a"
 
-#: ../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"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
 msgstr ""
 "Sposta la vista sulla primitiva a cui si riferisce il primo membro "
 "selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 "Ingrandimento disabilitato perché il livello di questa relazione non è attivo"
 
-#: ../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 "Ingrandimento disabilitato perché non c'è alcun membro selezionato"
@@ -6118,5 +6208,5 @@
 msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
 
-#: ../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}"
@@ -6193,7 +6283,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Attualmente non ci sono changeset aperti."
+msgstr "<html>Non è stata selezionata nessuna area di scarico.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6203,14 +6292,14 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
+"<html><strong>Area di scarico corrente</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Creazione confine"
+msgstr "Crea segnalibro"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Modifica la relazione correntemente selezionata"
+msgstr "Aggiungi un segnalibro per l'area di scarico correntemente selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6218,10 +6307,11 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"Al momento non è stata selezionata alcuna area di scarico. Selezionare prima "
+"un'area."
 
 #: ../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 "Inserisci il nome della località."
+msgstr "Inserire un nome per il segnalibro dell'area di scarico."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6231,12 +6321,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Sposta in alto i membri attualmente selezionati"
+msgstr "Rimuovi i segnalibri correntemente selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Sposta in alto i membri attualmente selezionati"
+msgstr "Rinomina i segnalibri correntemente selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6272,17 +6360,17 @@
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
-msgstr ""
+msgstr "La stringa ''''{0}'''' non è un valore in doppia precisione valido."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Per la latitudine è richiesto un valore nell'intervallo [-90,90]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Per la longitudine è richiesto un valore nell'intervallo [-180,180]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "Incolla indirizzo URL dagli appunti"
 
 #. adding the download tasks
@@ -6296,7 +6384,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Divide un percorso al nodo selezionato."
+msgstr ""
+"Selezionare per scaricare i dati OSM presenti nell'area di scarico "
+"selezionata."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6305,7 +6394,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Il percorso selezionato non contiene il nodo selezionato."
+msgstr ""
+"Selezionare per scaricare i tracciati GPS presenti nell'area di scarico "
+"selezionata."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6318,4 +6408,7 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Seleziona per scaricare i dati in un nuovo livello dei dati."
+"<br>Deselezionare per scaricare nel livello dei dati correntemente attivo.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -6329,7 +6422,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Nessuna relazione selezionata"
+msgstr "Nessuna area ancora selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6344,18 +6436,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr ""
-"Cliccare per chiudere la finestra ed annullare l'eliminazione degli oggetti"
+msgstr "Cliccare per chiudere la finestra e per annullare lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Modifica la relazione correntemente selezionata"
+msgstr "Cliccare per scaricare l'area correntemente selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Scegli la riga da modificare."
+msgstr "Selezionare prima un'area di scarico."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6365,4 +6453,7 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono abilitati."
+"<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
@@ -6371,11 +6462,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Inserire il nome di un luogo da cercare:"
+msgstr "Inserire il nome di una località da ricercare"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Aree attorno le località"
 
 #. SAXException does not chain correctly
@@ -6385,20 +6475,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Cerca..."
+msgstr "Cerca ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Direzione di ricerca della terraferma"
+msgstr "Cliccare per iniziare la ricerca delle località"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
 msgid "Querying name server"
-msgstr ""
+msgstr "Interrogazione del server dei nomi"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Interrogazione del server dei nomi ..."
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7320,7 +7408,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "vicino a"
+msgstr "Vicino a"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7370,5 +7457,5 @@
 msgstr "Browser dell'aiuto di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7389,5 +7476,5 @@
 "({1})</a> oppure <a href=\"{3}\">nella lingua inglese</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
 #, java-format
 msgid ""
@@ -7402,5 +7489,5 @@
 "messaggio di errore è (non tradotto):<br><tt>{1}</tt></p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
 #, java-format
 msgid ""
@@ -7412,19 +7499,19 @@
 "propria<br>connessione ad internet</html>"
 
-#: ../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 "Fallita l'apertura dell'indirizzo URL"
 
 #. 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 "Apri la pagina di aiuto corrente in un browser esterno"
 
 #. 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 "Modifica la pagina di aiuto corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7437,28 +7524,28 @@
 
 #. 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 "Ricarica la pagina di aiuto corrente"
 
 #. 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 "Vai alla pagina precedente"
 
 #. 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 "Vai alla pagina successiva"
 
 #. 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 "Vai alla pagina iniziale di aiuto a JOSM"
 
-#: ../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 "Attenzione: posizione errata nel documento HTML. L'eccezione è stata: "
 
-#: ../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 ""
@@ -7466,5 +7553,5 @@
 "vuoto."
 
-#: ../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 "Fallita l'apertura della pagina di aiuto"
@@ -7488,32 +7575,32 @@
 msgstr "Longitudine: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr "Coordinate"
 
-#: ../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 "Storico per il nodo {0}"
 
-#: ../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 "Storico per il percorso {0}"
 
-#: ../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 "Storico per la relazione {0}"
 
-#: ../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 "Chiudi la finestra"
 
-#: ../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 "Ricarica lo storico dal server"
 
-#: ../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 ""
@@ -7521,6 +7608,6 @@
 "riferimento."
 
-#: ../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 ""
@@ -7530,5 +7617,5 @@
 "corrisponde allo storico con ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7538,5 +7625,5 @@
 "è disponibile nello storico."
 
-#: ../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 ""
@@ -7544,5 +7631,5 @@
 "primitiva corrente."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7553,24 +7640,34 @@
 "non è disponibile nello storico."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Carica storico"
 
-#: ../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 "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
 
-#: ../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 "Caricamento dello storico per il nodo {0}"
 
-#: ../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 "Caricamento dello storico per il percorso {0}"
 
-#: ../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}"
@@ -7583,4 +7680,22 @@
 msgstr "Nodo {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Porta lo zoom sul problema"
+
+#: ../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 "Carica storico"
+
+#: ../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
@@ -7593,13 +7708,59 @@
 msgstr "Relazione {0}"
 
-#: ../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 "Ordina il menu dei preimpostati"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr "Insieme di modifiche"
 
-#: ../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 "sconosciuto"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
 #, java-format
 msgid ""
@@ -7607,4 +7768,9 @@
 msgstr ""
 "<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "<anonimo>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7630,4 +7796,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Versione {0} creata il {1} da {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "cancellato"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Versione {0} creata il {1} da {2}"
 
@@ -8002,5 +8183,5 @@
 
 #: ../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:"
@@ -8090,13 +8271,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 "Carica dal server la lista degli insiemi di modifiche personali aperti"
 
-#: ../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 "Chiudi l'insieme di modifiche aperto correntemente selezionato"
 
-#: ../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
@@ -8169,5 +8350,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}..."
@@ -8179,5 +8360,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 "Immagini geoetichettate"
@@ -8203,5 +8384,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"
@@ -8256,43 +8437,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 "punto GPS"
 
 #: ../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 "Personalizza disegno linee"
 
 #: ../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 "Usa le impostazioni globali."
 
 #: ../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 "Disegna le linee tra i punti di questo livello."
 
 #: ../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 "Non disegnare le linee tra i punti di questo livello."
 
 #: ../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 "Seleziona le opzioni per il disegno delle linee"
 
 #: ../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 "Personalizza colori"
 
 #: ../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"
@@ -8300,6 +8481,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"
@@ -8389,10 +8570,10 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../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 "Converti in livello dati"
 
-#: ../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."
@@ -8403,43 +8584,43 @@
 "tracciati, vedere qui:"
 
-#: ../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 "Convertito da: {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 "Scarica da OSM lungo questo tracciato"
 
-#: ../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 "Scarica tutto entro:"
 
-#: ../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} metri"
 
-#: ../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 "Area massima per richiesta:"
 
-#: ../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} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8450,9 +8631,9 @@
 "vuole procedere?</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 "Nessuna traccia GPX da associare con l'audio."
 
-#: ../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 "
@@ -8463,5 +8644,5 @@
 "all'inizio."
 
-#: ../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 "
@@ -8499,5 +8680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8508,12 +8689,14 @@
 "server."
 msgstr[0] ""
-"{0} oggetto è stato epurato dall''insieme di dati locale perché risulta "
-"eliminato dal server."
+"{0} conflitto è stato <strong>risolto automaticamente</strong> eliminando "
+"{0} oggetto<br>dall''insieme di dati locale perché è stato eliminato dal "
+"server."
 msgstr[1] ""
-"{0} oggetti sono stati epurati dall''insieme di dati locale perché risultano "
-"eliminati dal server."
+"{0} conflitti sono stati <strong>risolti automaticamente</strong> eliminando "
+"{0} oggetti<br> dall''insieme di dati locale perché sono stati eliminati dal "
+"server."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8523,44 +8706,43 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
-"Consultare la finestra con la lista dei conflitti<br>e risolverli "
-"manualmente."
+"{0} conflitto in attesa di essere risolto.<br><br>Aprire la lista dei "
+"conflitti e risolverlo manualmente."
 msgstr[1] ""
-"Consultare la finestra con la lista dei conflitti<br>e risolverli "
-"manualmente."
+"{0} conflitti in attesa di essere risolti.<br><br>Aprire la lista dei "
+"conflitti e risolverli manualmente."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Chiudi questa finestra e ritorna alle modifiche in JOSM"
-
-#: ../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 "Cliccare per chiudere questa finestra e continuare a modificare"
+
+#: ../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} eliminati)"
-msgstr[1] " ({0} eliminati)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] "{0} eliminato"
+msgstr[1] "{0} eliminati"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "disattiva"
 
-#: ../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 "Versione delle API: {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 "Converti in un layer GPX"
 
-#: ../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."
@@ -8571,5 +8753,5 @@
 "vedere qui:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8578,5 +8760,5 @@
 msgstr[1] "tracciati"
 
-#: ../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"
@@ -8584,5 +8766,5 @@
 msgstr[1] "punti"
 
-#: ../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"
@@ -8591,5 +8773,5 @@
 msgstr[1] "una traccia con {0} punti"
 
-#: ../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"
@@ -8598,5 +8780,5 @@
 msgstr[1] "{0} è composto da {1} tracce"
 
-#: ../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"
@@ -8605,9 +8787,9 @@
 msgstr[1] "{0} punti"
 
-#: ../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 "segnaposto gps"
 
-#: ../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"
@@ -8615,5 +8797,5 @@
 msgstr[1] "marcatori"
 
-#: ../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"
@@ -8622,14 +8804,14 @@
 msgstr[1] "{0} è composto da {1} marcatori"
 
-#: ../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 "Sincronizza l'audio"
 
-#: ../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 "Premi pausa quando senti il segnale di sincronizzazione."
 
-#: ../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
@@ -8637,14 +8819,14 @@
 msgstr "Audio sincronizzato al punto {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 "Impossibile sincronizzare nel layer in esecuzione."
 
-#: ../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 "Esegui il marcatore audio all'inizio del brano"
 
-#: ../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 "
@@ -8652,13 +8834,13 @@
 msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
 
-#: ../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 "Non ci sono marcatori audio in questo layer da compensare."
 
-#: ../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 "Mostra/Nascondi testo/icone"
 
-#: ../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 "Invertire la visualizzazione dei marcatori di testo ed icone"
@@ -8728,5 +8910,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 "Scegli la riga da modificare."
@@ -8740,5 +8922,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."
@@ -9460,12 +9642,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Attiva"
+msgstr "Stili attivi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Stili disponibili (da {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9500,61 +9681,58 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Aggiungi un nome di file o un indirizzo URL di uno stile attivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
+msgstr "Rimuovi gli stili selezionati dalla lista degli stili attivi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
+msgstr ""
+"Modifica il nome di file o indirizzo URL per lo stile attivo selezionato"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
+msgstr ""
+"Aggiungi gli stili disponibili selezionati alla lista degli stili attivi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Ricarica la lista degli stili disponibili da ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Aggiungi una nuova etichetta"
+msgstr "Aggiungi il percorso di una nuova icona"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Chiudi i gruppi di modifiche aperti selezionati"
+msgstr "Rimuovi i percorsi delle icone selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Modifica la sorgente selezionata."
+msgstr "Modifica il percorso dell'icona selezionata"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Caricamento dello storico per il nodo {0}"
+msgstr "Caricamento dei sorgenti dello stile da ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Fallito il caricamento o lo scaricamento dei dati "
-"da<br>''''{0}''''<br>a causa di un problema con il loro trasferimento."
-"<br>Dettagli (non tradotti): {1}</html>"
+"<html>Fallito il caricamento della lista dei sorgenti degli stili "
+"da<br>''''{0}''''.<br><br>Dettagli (non tradotti):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
+msgstr ""
+"Attenzione: formato non valido della voce nella lista degli stili "
+"''''{0}''''. Ottenuto ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -10198,5 +10376,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}''."
@@ -10227,5 +10405,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}."
@@ -10233,5 +10411,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}"
@@ -10246,5 +10424,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}''."
@@ -10415,5 +10593,5 @@
 msgstr "il file \"{0}\" non esiste"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10424,5 +10602,5 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 ""
@@ -10430,10 +10608,10 @@
 "<way>."
 
-#: ../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 "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
 
-#: ../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}."
@@ -10442,5 +10620,5 @@
 "{0}."
 
-#: ../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 ""
@@ -10448,10 +10626,10 @@
 "dell'elemento <relation>."
 
-#: ../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 "Attributo ''''ref'''' mancante sul membro nella relazione {0}."
 
-#: ../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}"
@@ -10460,10 +10638,10 @@
 "{0}. Ottenuto {1}"
 
-#: ../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 "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10473,9 +10651,9 @@
 "relazione {1}. Ottenuto {2}."
 
-#: ../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 "<member> incompleto, specificazione con 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."
@@ -10484,10 +10662,10 @@
 "ingresso. Omesso."
 
-#: ../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 "Oggetto illegale con 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 ""
@@ -10500,9 +10678,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 ""
@@ -10514,20 +10692,20 @@
 
 #. 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 "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
 
-#: ../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 "Attributo ''''versione'''' mancante sulla primitiva OSM con ID {0}."
 
-#: ../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 "Manca l''attributo obbligatorio ''''{0}''''."
 
-#: ../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}''."
@@ -10535,5 +10713,5 @@
 "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
 #, java-format
 msgid ""
@@ -10543,5 +10721,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10552,5 +10730,5 @@
 "almeno un nodo nei dati caricati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10560,5 +10738,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10569,13 +10747,13 @@
 "con ID esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "Analisi dei dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Preparazione dell'insieme di dati..."
@@ -10739,14 +10917,13 @@
 
 #: ../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] "L'estensione {0} è stata scaricata con successo. Riavviare JOSM."
-msgstr[1] ""
-"Le estensioni {0} sono state scaricate con successo. Riavviare JOSM."
+msgstr[0] "{0} Estensione scaricata con successo."
+msgstr[1] "{0} Estensioni scaricate con successo."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Riavviare JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -10801,4 +10978,8 @@
 "Update plugins now?"
 msgstr ""
+"E' stato aggiornato il proprio programma JOSM.\n"
+"Per prevenire alcuni problemi le estensioni dovrebbero aggiornate di "
+"conseguenza.\n"
+"Aggiornare le estensioni adesso?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
@@ -10811,5 +10992,4 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
 msgstr "Aggiorna estensioni"
@@ -10817,5 +10997,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Skip update"
-msgstr ""
+msgstr "Salta aggiornamento"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
@@ -10959,35 +11139,4 @@
 "{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 "sconosciuto"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -11129,11 +11278,11 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
 msgstr ""
-"<html>Il server riporta che è stato trovato un conflitto.<br>Messaggio "
-"d''errore (non tradotto):<br>{0}"
+"<html>Il server riporta che è stato rilevato un conflitto.<br>Messaggio di "
+"errore (non tradotto):<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
@@ -11696,47 +11845,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 "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../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 "Inizio analisi cartella"
 
-#: ../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 "Uno dei file selezionati è nullo !!!"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
+msgstr "Uno dei file selezionati era nullo"
+
+#: ../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 "Lettura delle foto ..."
 
-#: ../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 "Non è possibile ottenere il percorso canonico per la cartella {0}\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 "Analisi cartella {0}"
 
-#: ../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 "Trovato un file nullo nella cartella {0}\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 "Errore durante il prelevamento dei file dalla cartella {0}\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 "Correlazione ai dati GPX"
 
-#: ../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."
@@ -11752,24 +11900,24 @@
 msgstr "Carica le immagini come un nuovo layer."
 
-#: ../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 "File GPX (*.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 "Il file {0} è stato caricato già sotto il nome \"{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 "Impossibile interpretare {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 "Impossibile leggere \"{0}\""
 
-#: ../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."
@@ -11780,34 +11928,34 @@
 "la foto.<br>Copia l'ora dalla foto e seleziona la fascia oraria<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 "Ora di scatto della fotografia (dai dati 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 "Ora GPS (letto dalla fotografia precedente): "
 
-#: ../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 " [gg/mm/aaaa 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 "Mi trovo nel fuso orario di: "
 
-#: ../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 "Nessuna data"
 
-#: ../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 "Apri un'altra fotografia"
 
-#: ../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 "Sincronizza l'ora da una fotografia del ricevitore GPS"
 
-#: ../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"
@@ -11817,29 +11965,29 @@
 "Si prega di usare il formato richiesto"
 
-#: ../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 "Data non valida"
 
-#: ../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 "<Nessun tracciato GPX ancora caricato>"
 
-#: ../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 "Tracciato GPX: "
 
-#: ../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 "Apri un altro tracciato GPX"
 
-#: ../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 "Fuso orario: "
 
-#: ../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 "Scostamento:"
 
-#: ../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 ""
@@ -11847,41 +11995,41 @@
 "di aiuto?</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 "Aggiorna la posizione per: "
 
-#: ../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 "Tutte le immagini"
 
-#: ../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 "Immagini senza posizione exif"
 
-#: ../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 "Immagini ancora senza etichetta"
 
-#: ../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 "Correla le immagini al tracciato GPX"
 
-#: ../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 "Correla"
 
-#: ../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 "Auto-determina"
 
-#: ../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 "Selezionare un tracciato GPX"
 
-#: ../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 "Nessun tracciato GPX selezionato"
 
-#: ../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 ""
@@ -11892,9 +12040,9 @@
 "Formato atteso: {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 "Fuso orario non valido"
 
-#: ../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 ""
@@ -11905,26 +12053,26 @@
 "Formato atteso: {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 "Compensazione non valida"
 
-#: ../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 "Trovate {0} corrispondenze {1} nel tracciato GPX {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 "Tracciato GPS caricato"
 
-#: ../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 "Le foto selezionate non contengono informazioni sull'ora."
 
-#: ../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 "Le foto non contengono informazioni sull'ora"
 
-#: ../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."
@@ -11933,39 +12081,39 @@
 "Selezionarne un altro."
 
-#: ../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 "Il tracciato GPX non contiene alcuna informazione sull'ora"
 
-#: ../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 "Fuso orario: {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 "Minuti: {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 "Secondi: {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 "Correlate {0} su {1} foto al tracciato GPX."
 
-#: ../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 "(Differenza di orario pari a {0} giorni)"
 
-#: ../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 "Differenza tra il tracciato e le foto: {0}m {1}s"
 
-#: ../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 "
@@ -11976,13 +12124,13 @@
 "manualmente le foto."
 
-#: ../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 "E' fallita la correlazione delle foto al tracciato"
 
-#: ../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 "Regola fuso orario e differenza"
 
-#: ../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 "Valori predefiniti"
@@ -12003,5 +12151,5 @@
 msgstr "Errore nel file {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -12017,37 +12165,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 "Seleziona Feuille"
 
-#: ../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 "Errore durante il caricamento del file"
 
-#: ../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 "File cache della zona 1 di Lambert (.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 "File cache della zona 2 di Lambert (.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 "File cache della zona 3 di Lambert (.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 "File cache della zona 4 di Lambert (.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: indirizzo url non valido."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -12061,18 +12209,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 "Seleziona il comune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Scegliere da..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
@@ -12105,34 +12253,34 @@
 "del pannello delle opzioni. L''eccezione è stata: {0}"
 
-#: ../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 "Sostituisci lo sfondo originale con il colore di sfondo 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 "Inverti i colori grigi (per sfondi neri)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Imposta lo sfondo trasparente."
 
-#: ../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 "Traccia i contorni dei dati scaricati."
 
-#: ../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 "Disabilita il ritaglio dell'immagine durante la georeferenziazione."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "Enable automatic caching."
 msgstr "Abilita la cache automatica."
 
-#: ../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 "Massima dimensione della cache (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."
@@ -12150,9 +12298,9 @@
 "caricamento di dati creati da questa estensione."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS francese del catasto"
 
-#: ../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 ""
@@ -12160,10 +12308,10 @@
 "automatica</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Sorgente"
 
-#: ../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 "
@@ -12173,5 +12321,5 @@
 "preferenze di JOSM."
 
-#: ../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). "
@@ -12181,9 +12329,9 @@
 "intermedi). Utile per testi su sfondi scuri."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Permette la sovrapposizione di livelli multipli"
 
-#: ../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 ""
@@ -12191,37 +12339,37 @@
 "trasparente."
 
-#: ../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 "Traccia un rettangolo attorno i dati scaricati dal server WMS."
 
 #. 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 "Moltiplicatore di cattura per immagini vettoriali:"
 
-#: ../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 ""
 "Ottieni immagini più piccole (maggiore qualità ma più utilizzo di memoria)"
 
-#: ../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 "Dimensioni fisse riquadro (predefinito è 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 "Dimensioni fisse (da 25 a 1000 metri)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176
 msgid "Raster images grab multiplier:"
 msgstr "Moltiplicatore di cattura per immagini raster:"
 
 #. 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 "Mostra trasversali:"
 
-#: ../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 ""
@@ -12229,31 +12377,31 @@
 "dimensione"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Aggiunta l'auto-etichettatura della sorgente:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Aggiungere \"source=...\" agli elementi?"
 
-#: ../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 "Scaricamento di {0}"
 
-#: ../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 "Collegamento al Server WMS in corso..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Crea un edificio"
 
-#: ../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"
@@ -12263,30 +12411,30 @@
 "la dimensione massima di importazione dell'edificio è di 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 "Abilitare la sorgente automatica e controllare l'annata del catasto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "Estrai il riquadro di visualizzazione SVG..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Estrai il riquadro più appropriato..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Creazione confine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Connessione al WMS del catasto ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr "Immagine già caricata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -12296,29 +12444,29 @@
 "Utilizzare normalmente il menu di cattura del catasto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "Estrai il confine del comune"
 
-#: ../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 "Solo su livelli vettoriali"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Estrai le piante degli edifici"
 
-#: ../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 "Scarica immagine dal WMS francese del catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Catasto: {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"
@@ -12330,13 +12478,13 @@
 "del catasto e riprovare"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:48
 msgid "Grab non-georeferenced image"
 msgstr "Cattura immagine non georeferenziata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:69
 msgid "Georeferencing interrupted"
 msgstr "Georeferenziazione interrotta"
 
-#: ../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"
@@ -12346,5 +12494,5 @@
 "Si desidera utilizzarli?"
 
-#: ../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"
@@ -12354,14 +12502,14 @@
 "(richiesti due punti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
 msgid "Image cropping"
 msgstr "Ritaglio immagine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Click second corner for image cropping"
 msgstr "Cliccare il secondo angolo per il ritaglio dell''immagine"
 
-#: ../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"
@@ -12371,14 +12519,14 @@
 "(richiesti due punti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
 msgid "Image georeferencing"
 msgstr "Georeferenziazione immagine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Cliccare la seconda traversa di Lambert per la georeferenziazione"
 
-#: ../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"
@@ -12388,64 +12536,64 @@
 "o riprovare "
 
-#: ../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 "Inserire la posizione est,nord del catasto"
 
-#: ../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 "(Attenzione: controllare la direzione nord mediante la freccia !!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "East"
 msgstr "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Nord"
 
-#: ../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 "Imposta {0} coordinate di Lambert"
 
-#: ../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 "Imposta manualmente la zona di Lambert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Zone"
 msgstr "Zona"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Zona di Lambert"
 
-#: ../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 "Carica la posizione dalla cache (solo se la cache è abilitata)"
 
-#: ../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 "{0} non ammesso con la proiezione corrente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Cambia posizione"
 
-#: ../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 "Imposta una nuova posizione per la prossima richiesta"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Aggiungi un nuovo livello"
 
-#: ../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 "Posizione"
 
-#: ../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 "
@@ -12455,25 +12603,25 @@
 "punteggiatura conosciuta da 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 "Aggiungi un nuovo livello"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Reimposta il cookie"
 
-#: ../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 "Ottieni un nuovo cookie (sessione scaduta)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "File PNG (*.png)"
 
-#: ../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 "Esporta in formato PNG (solo immagini raster)"
 
-#: ../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
@@ -12483,14 +12631,14 @@
 msgstr[1] "Semplifica percorso (rimuovi {0} nodi)"
 
-#: ../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 "Regola WMS"
 
-#: ../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 "Regola la posizione del livello WMS (solo immagini non vettoriali)"
 
-#: ../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"
@@ -12500,5 +12648,5 @@
 "una \"immagine piatta\" (immagine raster) del cadastre"
 
-#: ../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
@@ -12506,5 +12654,5 @@
 msgstr "Scarica il tassello WMS da {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"
@@ -12514,34 +12662,34 @@
 "Selezionare prima uno di questi, e poi riprovare"
 
-#: ../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 "Livello vuoto"
 
-#: ../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 "Layer WMS ({0}), {1} tasselli caricati"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Non è vettorializzato"
 
-#: ../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 "Dimensioni raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "E' stato vettorializzato"
 
-#: ../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 "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12552,9 +12700,9 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../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}"
@@ -12563,9 +12711,9 @@
 "corrente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Errore nella zona di Lambert della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12679,9 +12827,9 @@
 msgstr "Crea un percorso duplicato"
 
-#: ../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 "Livello per la modifica dei tracciati GPX"
 
-#: ../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 "Converti in livello GPX con orario anonimo"
@@ -12698,11 +12846,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 "Importa percorso da un livello GPX"
 
 #: ../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 "Elimina percorso esistente"
@@ -12712,5 +12860,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 "Non è stato trovato alcun livello dei dati GPX."
@@ -12923,5 +13071,5 @@
 msgstr "Visualizza le foto non geo-referenziate"
 
-#: ../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 "Immagini importate"
@@ -13362,5 +13510,5 @@
 msgstr "Angolo compreso tra due nodi selezionati"
 
-#: ../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 "Livello in cui fare le misurazioni"
@@ -13443,5 +13591,5 @@
 msgstr "Ciclo di scaricamento di 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 "Visualizza segnalazioni OpenStreetBugs"
@@ -13588,7 +13736,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Layer"
+msgstr "PicLayer"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13759,43 +13906,41 @@
 msgstr "Inserire i valori di peso"
 
-#: ../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 Map"
 
-#: ../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 "Ingrandimento automatico"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../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 "Mostra informazioni"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+msgstr "Mostra informazioni sul tassello"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../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 "Aumenta l'ingrandimento"
 
-#: ../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 "Diminuisci l'ingrandimento"
 
-#: ../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
+msgstr "Blocca alla dimensione del tassello"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226
 msgid "Flush Tile Cache"
 msgstr "Svuota la cache dei tasselli"
 
-#: ../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 "immagine "
@@ -13831,7 +13976,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Massimo livello di zoom: "
+msgstr "Livello di ingrandimento minimo: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -14197,6 +14341,6 @@
 msgstr "Sei sicuro?"
 
-#: ../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
@@ -14204,5 +14348,5 @@
 msgstr "Errori di verifica"
 
-#: ../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 "Nessun errore individuato"
@@ -14296,5 +14440,5 @@
 msgstr "altra validazione"
 
-#: ../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}"
@@ -14394,5 +14538,4 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
 msgstr "Linea di costa non connessa"
@@ -14426,19 +14569,19 @@
 msgstr "Percorsi incrociati"
 
-#: ../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 "Nodi duplicati"
 
-#: ../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 ""
 "Questo controllo verifica che non ci siano due nodi nella stessa posizione."
 
-#: ../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 "Nodi nella stessa posizione"
 
-#: ../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 "Conferma"
@@ -14607,43 +14750,43 @@
 #. 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 "Problema di disegno"
 
-#: ../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 "Chiave ''{0}'' non valida."
 
-#: ../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 "Tag con valori vuoti"
 
-#: ../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 "chiave della proprietà non valida"
 
-#: ../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 "spazio non valido nella chiave della proprietà"
 
-#: ../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 "Il valore della proprietà inizia o finisce con uno spazio"
 
-#: ../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 "Il valore della proprietà contiene una entità HTML"
 
-#: ../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 "Chiave ''''{0}'''' non presente nei preimpostati."
 
-#: ../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 "I preimpostati non contengono la chiave della proprietà"
 
-#: ../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."
@@ -14651,17 +14794,17 @@
 "Valore ''''{0}'''' per la chiave ''''{1}'''' non presente nei preimpostati."
 
-#: ../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 "I preimpostati non contengono il valore della proprietà"
 
-#: ../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 "FIXME"
 
-#: ../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 "Verifica le chiavi delle proprietà."
 
-#: ../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 ""
@@ -14669,22 +14812,22 @@
 "valide."
 
-#: ../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 "Usa un analizzatore delle proprietà complesso."
 
-#: ../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 ""
 "Valida i valori delle proprietà e delle etichette usando regole complesse."
 
-#: ../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 "Sorgente TagChecker"
 
-#: ../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."
@@ -14695,25 +14838,25 @@
 "delle etichette."
 
-#: ../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 "Aggiungi una nuova sorgente alla lista."
 
-#: ../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 "Modifica la sorgente selezionata."
 
-#: ../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 "Elimina la sorgente selezionata nella lista."
 
-#: ../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 "Sorgenti dei dati"
 
-#: ../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 "Verifica i valori delle proprietà."
 
-#: ../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 ""
@@ -14721,9 +14864,9 @@
 "validi."
 
-#: ../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 "Cerca FIXME."
 
-#: ../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 ""
@@ -14731,55 +14874,55 @@
 "proprietà."
 
-#: ../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 "Controllare le note di disegno."
 
-#: ../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 "Controllare se il disegno della mappa contiene degli errori."
 
-#: ../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 "Usa file dati predefinito."
 
-#: ../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 "Usa il file dati predefinito (consigliato)."
 
-#: ../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 "Utilizza il file di \"ignoramento\" dell'etichetta predefinita"
 
-#: ../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 ""
 "Utilizza il file di \"ignoramento\" dell'etichetta predefinita (consigliato)."
 
-#: ../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 "Usa file di controllo ortografico predefinito."
 
-#: ../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 "Usa il file di controllo ortografico predefinito (consigliato)."
 
-#: ../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 "Correggi proprietà"
 
-#: ../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 "Impossibile trovare il tipo di elemento"
 
-#: ../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 "Impossibile trovare il livello di avvertimento"
 
-#: ../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 "Espressione illegale \"{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}''"
@@ -14955,17 +15098,17 @@
 "Questo controllo verifica se una via finisce molto vicina ad un'altra via."
 
-#: ../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 "Nodo finale del percorso vicino ad altra strada"
 
-#: ../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 "Nodo finale del percorso vicino ad altro percorso"
 
-#: ../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 "Nodo del percorso vicino ad altro percorso"
 
-#: ../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 "Nodo finale della strada collegata vicino ad un'altra strada"
@@ -15022,13 +15165,13 @@
 "delle linee di costa."
 
-#: ../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 "Linea di costa invertita: terraferma non sul lato sinistro"
 
-#: ../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 "Acqua invertita: manca la terraferma sul lato sinistro"
 
-#: ../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 "Terraferma invertita: manca la terraferma sul lato sinistro"
@@ -15069,7 +15212,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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
+msgstr "Livello Walking Papers ({0}) con ingrandimento {1}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -15077,85 +15220,67 @@
 msgstr "Walking Papers"
 
-#: ../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 "Selezionare un nodo iniziale alla fine di un percorso"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "E' stata raggiunta la fine della linea"
-
-#. 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"
-msgstr "E' stato raggiunto un incrocio"
+#: ../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 "Scarica"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Scarica i dati della mappa dal server OSM."
+
+#: ../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>Non ci sono livelli al quale unire il livello sorgente ''{0}''.</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 "Rimozione dei nodi duplicati in corso..."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#, fuzzy
+msgid "<html>No more connected ways to download.</html>"
+msgstr "<html>Non è stata selezionata nessuna area di scarico.</html>"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "E' stata generata una eccezione"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "aiuto"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Aiuto / Informazioni su"
-
-#: ../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 ""
-"Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda "
-"delle preferenze di WMSplugin - questi verranno visualizzati nel menu WMS.\n"
-"\n"
-"Si possono anche aggiungere manualmente nelle Preferenze Avenzate, "
-"utilizzando il seguente 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"
-"Esempio di indirizzo URL completo di WMS (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è "
-"solo necessario inserire l'identificativo rilevante.\n"
-"Per aggiungere una voce di menu Metacarta Map Rectifier, creare manualmente "
-"l'indirizzo URL come in questo esempio, sostituendo 73 con l'identificativo "
-"della propria immagine:\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"
-"Nota: Assicurarsi che l'immagine sia conforme, con un diritto d'autore "
-"ragionevole, e, se non si è sicuri, non utilizzarla."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Aiuto sull'estensione WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -15265,9 +15390,9 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../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}''"
@@ -15276,9 +15401,9 @@
 "non corretto ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr "(disattivato)"
 
-#: ../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}"
@@ -15286,10 +15411,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -15305,13 +15430,13 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../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"
@@ -15320,42 +15445,42 @@
 "oppure cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
@@ -19846,14 +19971,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Sito archeologico"
+msgstr "Sito paleontologico"
 
 #. 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 "Modifica sito archeologico"
+msgstr "Modifica sito paleontologico"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -22681,5 +22804,5 @@
 #: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
-msgstr "Modifica Colonnina SOS"
+msgstr "Modifica colonnina SOS"
 
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
@@ -27823,4 +27946,104 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "Nessun tipo trovato. Lo storico è vuoto."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr ""
+#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} "
+#~ "e versione {1}"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Selezionare un nodo iniziale alla fine di un percorso"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "E' stata raggiunta la fine della linea"
+
+#~ msgid "Reached a junction"
+#~ msgstr "E' stato raggiunto un incrocio"
+
+#~ msgid "help"
+#~ msgstr "aiuto"
+
+#~ msgid "Help / About"
+#~ msgstr "Aiuto / Informazioni su"
+
+#~ 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 ""
+#~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda "
+#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu "
+#~ "WMS.\n"
+#~ "\n"
+#~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, "
+#~ "utilizzando il seguente 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"
+#~ "Esempio di indirizzo URL completo di WMS (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è "
+#~ "solo necessario inserire l'identificativo rilevante.\n"
+#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare "
+#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con "
+#~ "l'identificativo della propria immagine:\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"
+#~ "Nota: Assicurarsi che l'immagine sia conforme, con un diritto d'autore "
+#~ "ragionevole, e, se non si è sicuri, non utilizzarla."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Aiuto sull'estensione WMS"
+
+#~ msgid "No data imported."
+#~ msgstr "Nessun dato importato."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Ricarica la lista di selezione"
+
 #~ msgid "File could not be found."
 #~ msgstr "Impossibile trovare il file."
@@ -27829,72 +28052,296 @@
 #~ msgstr "Selezionare almeno un compito per scaricare"
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Invio alle API di OSM fallito"
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "L'estensione del file è sconosciuta."
+
+#~ msgid "Change"
+#~ msgstr "Cambia"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
+
+#~ msgid "Rotate"
+#~ msgstr "Ruota"
+
+#~ msgid "different"
+#~ msgstr "diverso"
+
+#~ msgid "true"
+#~ msgstr "vero"
+
+#~ msgid "false"
+#~ msgstr "falso"
+
+#~ msgid "position"
+#~ msgstr "posizione"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} oggetto causa conflitti:"
+#~ msgstr[1] "{0} oggetti causano conflitti:"
+
+#~ msgid "my version:"
+#~ msgstr "versione locale:"
+
+#~ msgid "their version:"
+#~ msgstr "versione remota:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versione risolta:"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolvi conflitti"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
+
+#~ msgid "Object"
+#~ msgstr "Oggetto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
+#~ "versione selezionata nella lista della cronologia."
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupato da"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Errore di scansione nella risposta del server."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Impossibile connettersi al server."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Per prima cosa inserisci le coordinate della località."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Per prima cosa, scegli un segnalibro."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
+#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Connessione al server OSM..."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Impossibile interpretare"
+
+#~ msgid "File not found"
+#~ msgstr "File non trovato"
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome utente (email) per l'account di OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Username OSM (email)"
+
+#~ msgid "Unknown version"
+#~ msgstr "Versione sconosciuta"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Trovato <nd> elemento in non-percorso."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ha zero ref"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
+#~ "sul server."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigazione"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Unire i nodi con diffenti appartenenze?"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Errore durante il caricamento della pagina {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Apri nel Browser"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Guida in linea di JOSM"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
+#~ "questo come bug."
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Cancella {1} {0}"
+
+#~ msgid "Revert"
+#~ msgstr "Ripristina"
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Conflitto tra relazioni"
 
+#~ msgid "Merging conflicts."
+#~ msgstr "Unisci i conflitti."
+
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
 #~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
-#~ "{2}.<br>Eliminare dalla relazione?</html>"
+#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
+#~ "aspetta prima di riprovare."
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Aggiusta la posizione dl layer WMS"
 
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
 #~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
-#~ "<br>Eliminare dalla relazione?</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Impossibile interpretare"
-
-#~ msgid "File not found"
-#~ msgstr "File non trovato"
-
-#~ msgid "Replace"
-#~ msgstr "Sostituisci"
-
-#~ msgid "Replace the way this member refers to with the combined way"
+#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Tutti i percorsi erano vuoti"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (correzione GNOME)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Id dell'immagine Metacarta Map Rectifier"
+
+#~ msgid "Station"
+#~ msgstr "Stazione"
+
+#~ msgid "Edit Station"
+#~ msgstr "Modifica stazione"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usa la preimpostazione ''{0}''"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Unire i percorsi con diverse appartenenze?"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
 #~ msgstr ""
-#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
-#~ "percorso unito"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Per prima cosa inserisci le coordinate della località."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Per prima cosa, scegli un segnalibro."
+#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
+
+#~ msgid "Charge"
+#~ msgstr "Costo"
 
 #~ msgid "Please enter a search string"
 #~ msgstr "Inserire la stringa da cercare"
 
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
-
-#~ msgid "name"
-#~ msgstr "nome"
+#~ msgid "error requesting update"
+#~ msgstr "errore nella richiesta di aggiornamento"
+
+#~ msgid "requested: {0}"
+#~ msgstr "richiesta: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "errore nel caricamento dei metadati"
+
+#~ msgid "Request Update"
+#~ msgstr "Richiesta di aggiornamento"
+
+#~ msgid "Validate"
+#~ msgstr "Convalida"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "identificativo rectifier={0}"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Sorgenti preimpostazioni etichette"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Sorgente preimpostazioni etichette"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr ""
+#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostra lo stato dei tasselli"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
+#~ "cui si è ottenuto JOSM."
 
 #~ msgid "zoom"
 #~ msgstr "livello di ingrandimento"
 
-#~ msgid "Copy defaults"
-#~ msgstr "Copia predefiniti"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Selezionare la riga da copiare."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr ""
-#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
-#~ "di {0}."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Aggiungi una nuova sorgente XML alla lista."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)"
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
 
 #~ msgid ""
@@ -27906,286 +28353,4 @@
 #~ "warntime'.)"
 
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
-#~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Mostra lo stato dei tasselli"
-
-#~ msgid "Request Update"
-#~ msgstr "Richiesta di aggiornamento"
-
-#~ msgid "error loading metadata"
-#~ msgstr "errore nel caricamento dei metadati"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "richiesta: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "errore nella richiesta di aggiornamento"
-
-#~ msgid "No data imported."
-#~ msgstr "Nessun dato importato."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ricarica la lista di selezione"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "L'estensione del file è sconosciuta."
-
-#~ msgid "Change"
-#~ msgstr "Cambia"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
-
-#~ msgid "Rotate"
-#~ msgstr "Ruota"
-
-#~ msgid "different"
-#~ msgstr "diverso"
-
-#~ msgid "true"
-#~ msgstr "vero"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "position"
-#~ msgstr "posizione"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} oggetto causa conflitti:"
-#~ msgstr[1] "{0} oggetti causano conflitti:"
-
-#~ msgid "my version:"
-#~ msgstr "versione locale:"
-
-#~ msgid "their version:"
-#~ msgstr "versione remota:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versione risolta:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolvi conflitti"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
-
-#~ msgid "Object"
-#~ msgstr "Oggetto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
-#~ "versione selezionata nella lista della cronologia."
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupato da"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Errore di scansione nella risposta del server."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
-#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Connessione al server OSM..."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome utente (email) per l'account di OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Username OSM (email)"
-
-#~ msgid "Unknown version"
-#~ msgstr "Versione sconosciuta"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Trovato <nd> elemento in non-percorso."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ha zero ref"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
-#~ "sul server."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unire i nodi con diffenti appartenenze?"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Errore durante il caricamento della pagina {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Apri nel Browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Guida in linea di JOSM"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
-#~ "questo come bug."
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Cancella {1} {0}"
-
-#~ msgid "Revert"
-#~ msgstr "Ripristina"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Unisci i conflitti."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
-#~ "aspetta prima di riprovare."
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Aggiusta la posizione dl layer WMS"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Tutti i percorsi erano vuoti"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (correzione GNOME)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id dell'immagine Metacarta Map Rectifier"
-
-#~ msgid "Station"
-#~ msgstr "Stazione"
-
-#~ msgid "Edit Station"
-#~ msgstr "Modifica stazione"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usa la preimpostazione ''{0}''"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Unire i percorsi con diverse appartenenze?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid "Charge"
-#~ msgstr "Costo"
-
-#~ msgid "Validate"
-#~ msgstr "Convalida"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "identificativo rectifier={0}"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Sorgenti preimpostazioni etichette"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Sorgente preimpostazioni etichette"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr ""
-#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
-#~ "cui si è ottenuto JOSM."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
-
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Errore nell'eliminazione del file dell'estensione: {0}"
@@ -28202,4 +28367,7 @@
 #~ msgid "Copy Default"
 #~ msgstr "Copia predefinito"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Selezionare la riga da copiare."
 
 #~ msgid "citymap"
@@ -28626,4 +28794,7 @@
 #~ "sull'unione."
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Invio alle API di OSM fallito"
+
 #~ msgid "Undeleting relation..."
 #~ msgstr "Ripristino relazione..."
@@ -28682,4 +28853,13 @@
 #~ "{0}</html>"
 
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copia predefiniti"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Aggiungi una nuova sorgente XML alla lista."
+
 #~ msgid "Sort"
 #~ msgstr "Ordina"
@@ -28693,4 +28873,9 @@
 #~ msgid "History item"
 #~ msgstr "Elemento dello storico"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr ""
+#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
+#~ "di {0}."
 
 #~ msgid "No data"
@@ -28715,4 +28900,7 @@
 #~ "cercato di cancellare<br>dal server era già stata eliminata.<br><br>Il "
 #~ "messaggio di errore è:<br>{0}</html>"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
 
 #~ msgid "Download referrers from OSM..."
@@ -28805,4 +28993,19 @@
 #~ "ricevuto ''{1}''"
 
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr ""
+#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
+#~ "percorso unito"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
+#~ "{2}.<br>Eliminare dalla relazione?</html>"
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr ""
@@ -28810,4 +29013,11 @@
 #~ "\"{1}\""
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
+#~ "<br>Eliminare dalla relazione?</html>"
+
 #~ msgid "Relation: from {0} to {1} via {2}"
 #~ msgstr "Relazione: da {0} a {1} tramite {2}"
@@ -28827,4 +29037,11 @@
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Percorso intermedio: {0}"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
+#~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
 
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 18508)
+++ applications/editors/josm/i18n/po/ja.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-06 03:46+0000\n"
-"Last-Translator: higa4 <higa432@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-15 18:25+0000\n"
+"Last-Translator: nazotoko <shunw@ics.uci.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:08+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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "エラー"
@@ -208,6 +209,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"
@@ -319,5 +320,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
@@ -335,6 +336,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
@@ -345,5 +346,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
@@ -466,5 +467,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
@@ -506,5 +507,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
@@ -513,6 +514,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"
@@ -697,5 +699,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
@@ -708,5 +710,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"
@@ -779,5 +781,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
@@ -785,28 +795,28 @@
 msgstr "パラメータの ''{0}'' はヌルではいけません"
 
-#: ../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 "インポートした内容には {0} の競合があります。"
 
-#: ../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 "({0}/{1}) ノード {2} の親をロード中"
 
-#: ../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 "({0}/{1}) ウェイ {2} の親をロード中"
 
-#: ../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}"
@@ -843,10 +853,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 "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 "データをGPXファイルにエクスポートします。"
@@ -859,11 +869,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
@@ -894,5 +903,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
@@ -907,17 +915,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
@@ -979,5 +988,5 @@
 msgstr "ノードを一番近いセグメントに接続します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "ノードと線をつなぐ"
@@ -1008,21 +1017,21 @@
 msgstr "結合する少なくとも二つのウェイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "中止します..."
-
-#: ../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
+msgstr "クリックしてノードのマージを中断"
+
+#: ../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 ""
-"ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+"ノードをマージできません：おそらく使用中のウェイ ''{0}'' を削除する必要があり"
+"ます。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1163,7 +1172,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "データのダウンロード"
+msgstr "データをダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1180,13 +1188,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
-msgstr ""
+msgstr "輪郭をオルソ化 / 無効化"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
-msgstr ""
+msgstr "いくつかのノードのオルソ化を無効化"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
-msgstr ""
+msgstr "オルソ化 / 無効化"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
@@ -1195,9 +1203,9 @@
 "Please select nodes that were moved by the previous Orthogonalize Shape "
 "action!"
-msgstr ""
+msgstr "輪郭をオルソ化 / 無効化"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
-msgstr ""
+msgstr "オルソ化された輪郭を無効化"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
@@ -1218,5 +1226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
+msgstr "選択された要素はオルソ化できません"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
@@ -1312,10 +1320,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 "保存"
 
 #: ../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 "最新データを保存します。"
@@ -1372,10 +1380,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 "名前をつけて保存..."
 
 #: ../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 "現在のデータを新規ファイルに保存"
@@ -1417,30 +1425,30 @@
 
 #: ../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 "閉じる"
 
-#: ../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 "ウェイを分割"
 
-#: ../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 "選択したノードでウェイを分割"
 
-#: ../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 "現在の選択は分割できません。"
 
-#: ../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."
 msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../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,20 +1461,20 @@
 "てください。"
 
-#: ../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 "選択したノードは同じウェイで共有されていません。"
 
-#: ../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."
 msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
 
-#: ../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 ""
 "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
-#: ../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 "
@@ -1476,5 +1484,5 @@
 "する）"
 
-#: ../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 "
@@ -1484,5 +1492,5 @@
 "した。<br>これらを確認して必要なら訂正してください。</html>"
 
-#: ../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 "
@@ -1492,5 +1500,5 @@
 "らを確認して必要なら訂正してください。</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"
@@ -1520,37 +1528,37 @@
 msgstr "複数のウェイに使われているノードを複製します。"
 
-#: ../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 "このノードは、他のどれとも接着していません。"
 
-#: ../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 "どのノードも接着していません。"
 
-#: ../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 "どのウェイも接着していません。"
 
-#: ../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 "現在の選択は引き離せません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "ほかを選択："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* 1つのタグのついたノード、または"
 
-#: ../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 "* 1つ以上のウェイに使われている1つのノード, または"
 
-#: ../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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
-#: ../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"
@@ -1558,5 +1566,5 @@
 "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
 
-#: ../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."
@@ -1564,5 +1572,5 @@
 "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
 
-#: ../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"
@@ -1577,9 +1585,9 @@
 "コピーが作られ、全てのノードが選択状態になります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "ノードを引き離す"
 
-#: ../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"
@@ -1587,5 +1595,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"
@@ -1626,12 +1634,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "サーバから現在のデータレイヤーのオブジェクトを更新します。"
+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 "データのダウンロード"
@@ -1647,5 +1654,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "選択を更新"
 
@@ -1661,5 +1669,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "更新用に選択されたプリミティブがありません。"
 
@@ -1667,4 +1676,9 @@
 msgid "Selection empty"
 msgstr "選択は空です"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "オブジェクトを削除"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1674,7 +1688,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 "現在のデータレイヤーの変更を全てOSM サーバにアップロード"
+msgstr "OSMサーバへの有効なデータレイヤーの全ての変更をアップロード"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1820,28 +1833,28 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
-"ティブをスキップし、アップロードを再試行します。"
+"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク"
+"トをスキップしてもう一度アップロードします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
-"ティブをスキップし、アップロードを再試行します。"
+"オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをス"
+"キップします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "データアップロード中 ..."
+msgstr "{0} オブジェクトをアップロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
+msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1958,9 +1971,9 @@
 msgstr "ダウンロードされたGPXデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "データをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1968,5 +1981,5 @@
 msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
 
-#: ../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 "この範囲ではデータは見つかりません"
@@ -1982,16 +1995,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "表示(サーバ上)"
+msgstr "サーバでチェック"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセットか"
-"ら放棄されました。"
+"クリックしてあなたのローカルデータセット中の天気オブジェクトがサーバから削除"
+"されているかどうかチェック"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2001,7 +2012,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "クリックしてキャンセル後に地図編集を再開"
+msgstr "クリックして編集を中断および再開"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2025,7 +2035,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
+msgstr "一括ダウンロード中に次のエラーが発生: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2035,7 +2045,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "ダウンロード中にエラーです。"
+msgstr "ダウンロード中にエラー"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2049,5 +2058,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
@@ -2080,6 +2089,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 "選択済の"
@@ -2097,26 +2106,26 @@
 msgstr "ノードでウェイに追加"
 
-#: ../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 "既存のウェイをノードとつなぎます。"
 
-#: ../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 "既存のウェイに新しいノードを追加"
 
-#: ../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 "ウェイのノードを追加して接続"
 
-#: ../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 "新規ノードの作成"
 
-#: ../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 "カーソルの下のノードを選択"
 
-#: ../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."
@@ -2124,46 +2133,44 @@
 msgstr[0] "新規ノードを {0}このウェイに追加します。"
 
-#: ../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 "新規ウェイを最後に操作したノードから開始"
 
-#: ../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 "最後に操作したノードからウェイを継続"
 
-#: ../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 "描画の完了"
 
-#: ../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 "押し出し"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "エリアの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "ウェイを押し出す"
 
-#: ../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 "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
 
-#: ../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 "回転を止めるには、マウスボタンを放します。"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。"
 
@@ -2222,4 +2229,8 @@
 msgstr "常に移動し、ダイアログ表示は不要"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2228,4 +2239,8 @@
 "移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
 "マージします。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "回転を止めるには、マウスボタンを放します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2255,69 +2270,72 @@
 "移動; 右ドラッグによるズーム"
 
-#: ../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 "検索..."
 
-#: ../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 "オブジェクトを検索する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "データがロードされていないので検索できません。"
-
-#: ../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 "検索文字列を入力してください"
 
-#: ../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 "正規表現検索"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "セレクションを置換"
 
-#: ../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 "セレクションに加える"
 
-#: ../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 "セレクションの削除"
 
-#: ../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 "大/小文字を区別する"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "正規表現検索"
 
-#: ../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>ベイカー ストリート</b> - 任意のキーや名前の 'ベイカー' と 'ストリート'。"
 
-#: ../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>\"ベイカー ストリート\"</b> - 任意のキーや名前の 'ベイカー ストリート'。"
 
-#: ../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:Bak</b> - 'Bak' その名前のどこか。"
 
-#: ../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> -  正確に 'route'の値を持つキー 'type'です。"
 
-#: ../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>, "
@@ -2327,17 +2345,17 @@
 "<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:Bak</b> - その名前の内 'Bak' でない。"
 
-#: ../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> - key=任意の値を入力してください."
 
-#: ../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>特殊なターゲット:</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>)"
@@ -2345,62 +2363,61 @@
 "<b>type:</b> - オブジェクトの型 (<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>user:</b>... - 該当ユーザに変更された全オブジェクト"
 
-#: ../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 "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
 
-#: ../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>... - 指定されたノード番号のオブジェクト"
 
-#: ../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>... - 指定されたノード番号のオブジェクト"
-
-#: ../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>変更済み</b> - 変更されたオブジェクトすべて"
 
-#: ../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>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../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>不完全</b> - すべての不完全なオブジェクト"
 
-#: ../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>タグなし</b> - すべてのタグなしオブジェクト"
 
-#: ../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 "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
 
-#: ../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 "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
 
-#: ../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 "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
 
-#: ../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 "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
 
-#: ../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 "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../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
@@ -2410,51 +2427,51 @@
 msgstr "フィルター"
 
-#: ../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 "検索"
 
-#: ../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 "検索開始"
 
-#: ../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 "\"{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 "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../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 "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
-#: ../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 "''{0}'' を探しましたがセレクションの中には見つかりませんでした"
 
-#: ../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} の一致が見つかりました"
 
-#: ../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"
@@ -2508,16 +2525,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ"
-"い、例えば ノード: 10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2642,6 +2656,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
@@ -2769,5 +2783,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 ""
@@ -2790,9 +2804,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 "パラメータ ''{0}'' は空以外でなければなりません"
+msgstr "パラメータ ''{0}'' は空ではダメです"
 
 #: ../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"
@@ -2824,5 +2841,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 "ウェイのセグメントを分割"
@@ -2830,6 +2847,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."
@@ -2841,5 +2858,5 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "削除確認"
@@ -2850,5 +2867,15 @@
 msgstr "{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"
@@ -2931,5 +2958,5 @@
 msgstr "リレーション {1} の {0} タグ競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3036,8 +3063,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 "不正なダブル値 ''{0}''"
+
+#: ../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 "既定値は \"{0}\"です。"
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3176,9 +3209,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
 msgstr ""
-"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
-"の内容: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3237,5 +3268,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
@@ -3249,5 +3280,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 ""
@@ -3256,4 +3287,43 @@
 "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 "not に引数がありません。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "リレーション {0} の履歴"
+
+#: ../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
+#, fuzzy, 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 ""
+"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン "
+"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の"
+"プリミティブを残します。 "
 
 #. translators notes must be in front
@@ -3310,33 +3380,34 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {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 "ID >= 0 である必要があります。 {0} を受け取りました"
 
-#: ../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 "id=0 のプリミティブは非表示にできません"
 
-#: ../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 "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../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 "バージョン > 0 である必要があります。 {0} を受け取りました"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3365,20 +3436,23 @@
 "す。"
 
-#: ../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 "ノード {0} を不完全なウェイ {1} に追加できません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "この履歴にはバージョン {0} のプリミティブはありません"
-
-#: ../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 "履歴の日付 ''{0}'' には有効なバージョンはありません"
-
-#: ../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 "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
@@ -3386,25 +3460,5 @@
 "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました"
 
-#: ../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 "このデータセットには id {0} のプリミティブはありません"
-
-#: ../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 "このデータセットには id {0} バージョン {1} のプリミティブはありません"
-
-#: ../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
@@ -3415,6 +3469,7 @@
 msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
 
@@ -3425,148 +3480,145 @@
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
 
-#: ../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 "領域を指定するウェイが閉じていません。"
 
-#: ../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 "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../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 "メンバー \"{0}\"を関連から削除"
 
-#: ../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 "ウェイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../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 "二つ以上の\"from\"ウェイがあります。"
 
-#: ../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 "二つ以上の\"to\"ウェイがあります。"
 
-#: ../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 "経由地が複数有ります。"
 
-#: ../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 "不明なロール\"{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 "{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 "\"from\"ウェイが見つかりません"
 
-#: ../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 "\"to\"ウェイが見つかりません"
 
-#: ../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 "経由地かウェイが見つかりません。"
 
-#: ../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 "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../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 "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../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 "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../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 "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../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 "制約条件{0}のスタイルがありません。"
 
-#: ../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 "ウェイ \"{0}\"と\"{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 "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../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 "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../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 "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../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 "マルチポリゴン用の外側のウェイが ''{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 "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../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 "外側のウェイ ''{0}''のスタイルが合いません。"
 
-#: ../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 "タグ付いていない"
 
-#: ../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 "テキスト"
 
-#: ../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 ""
-"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン "
-"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の"
-"プリミティブを残します。 "
-
-#: ../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 "Error: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "停止中"
 
-#: ../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
@@ -3575,5 +3627,5 @@
 msgstr[0] "ノード"
 
-#: ../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
@@ -3582,6 +3634,6 @@
 msgstr[0] "ウェイ"
 
-#: ../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
@@ -3590,13 +3642,13 @@
 msgstr[0] "関連"
 
-#: ../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 "タグ付いていないウェイ"
 
-#: ../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 "不完全なウェイ"
 
-#: ../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
@@ -3604,5 +3656,5 @@
 msgstr "背景"
 
-#: ../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 "ハイライト"
@@ -3687,5 +3739,5 @@
 msgstr "今後は表示しない"
 
-#: ../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
@@ -3693,32 +3745,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 "不完全"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "道路"
 
-#: ../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 "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../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"
@@ -3726,5 +3778,5 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3732,33 +3784,33 @@
 msgstr[0] "{0} メンバー"
 
-#: ../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 "IO 例外"
 
-#: ../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
@@ -3766,9 +3818,9 @@
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "オブジェクトは削除されました"
@@ -3790,7 +3842,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "ダイアログを閉じる"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3991,5 +4042,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 "編集"
@@ -4117,10 +4168,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 "レイヤーがリストにありません。"
 
-#: ../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"
@@ -4128,7 +4179,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "いいえ、操作をキャンセルします"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4255,5 +4305,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"
@@ -4262,5 +4312,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"
@@ -4270,5 +4320,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 "メンバー"
@@ -4715,5 +4765,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 "いいえ、異常終了します"
@@ -4776,6 +4826,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 "<未定義>"
@@ -4879,7 +4927,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "ノードの結合時に競合 - 結合されたノードは''{0}'' です"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -4905,4 +4953,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"
@@ -5000,5 +5049,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"
@@ -5008,5 +5057,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"
@@ -5028,7 +5077,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "このリレーションメンバーをこのリレーションから除きます。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5047,12 +5095,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "選択されたメンバーにロールをセット"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "タグは、次のものでリレーションを変更しました:   "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5068,7 +5114,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5135,5 +5180,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
@@ -5227,5 +5272,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"
@@ -5281,11 +5326,11 @@
 msgstr "選択したアイテムすべての履歴の表示"
 
-#: ../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
@@ -5293,13 +5338,13 @@
 msgstr "再読込"
 
-#: ../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 "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
 
-#: ../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 "選択したオブジェクトの履歴を表示。"
@@ -5358,12 +5403,12 @@
 
 #: ../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] "これは、最大{0}このオブジェクトが変更されます。"
 
 #: ../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 "空の値でキーを削除。"
 
@@ -5387,4 +5432,10 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
+#: ../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] "これは、最大{0}このオブジェクトが変更されます。"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5461,60 +5512,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 "リレーション"
 
-#: ../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 "全てのリレーションのリストを開く"
 
-#: ../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 "リレーション: {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 "選択したリレーションの編集画面を開く"
 
-#: ../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 "選択したリレーションを削除"
 
-#: ../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 "新規リレーション作成"
 
-#: ../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 "選択したリレーションを削除"
-
-#: ../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 "ほかを選択："
-
-#: ../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 "選択したリレーションをダウンロード"
-
-#: ../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 "メンバーのダウンロード"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5674,5 +5721,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}"
@@ -5932,18 +5979,19 @@
 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"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#, fuzzy
+msgid "Zoom to the object 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: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 "選択されたメンバーが無いのでズームは無効化されました"
@@ -5966,5 +6014,5 @@
 msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
 
-#: ../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}"
@@ -6035,7 +6083,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "現在開かれている変更セットはありません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6047,12 +6094,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "行政区画の作成"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "現在選択されているリレーションを編集"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6063,7 +6108,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 "場所の名称を入力してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6073,12 +6117,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "現在選択したメンバーを一つ上に移動します"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "現在選択したメンバーを一つ上に移動します"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6118,5 +6160,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "緯度の値は、[-90,90]の範囲にある必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
@@ -6138,7 +6180,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "選択したノードでウェイを分割"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6147,7 +6188,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "選択したウェイは選択したノードをつかって構成されていません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6171,7 +6211,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "リレーションが選択されていません"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6184,17 +6223,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "クリックしてダイアログを閉じ、オブジェクト削除を中断"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "現在選択されているリレーションを編集"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "編集する列を選択してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6210,7 +6246,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "検索する地名を入れてください："
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6224,12 +6259,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "検索..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "陸地の検索方向"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7159,7 +7192,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "近く"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7209,5 +7241,5 @@
 msgstr "JOSM ヘルプブラウザ"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7221,5 +7253,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 ""
@@ -7230,5 +7262,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 ""
@@ -7237,19 +7269,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 "URLを開けません"
 
 #. 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 ""
@@ -7259,32 +7291,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 "JOSM ヘルプホームページへ"
 
-#: ../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 ""
@@ -7306,38 +7338,38 @@
 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 "ノード {0} の履歴"
 
-#: ../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 "ウェイ {0} の履歴"
 
-#: ../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 "リレーション {0} の履歴"
 
-#: ../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 ""
@@ -7345,5 +7377,5 @@
 msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7351,9 +7383,9 @@
 msgstr "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません"
 
-#: ../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 ""
@@ -7363,24 +7395,34 @@
 "現在のプリミティブの設定に失敗。現在のバージョン {0} は履歴で使用できません。"
 
-#: ../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 "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
 
-#: ../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 "ノード {0} の履歴をロード中"
 
-#: ../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 "ウェイ {0} の履歴をロード中"
 
-#: ../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}"
@@ -7393,4 +7435,22 @@
 msgstr "ノード {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "問題へズーム"
+
+#: ../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 "履歴をロード"
+
+#: ../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
@@ -7403,13 +7463,59 @@
 msgstr "リレーション {0}"
 
-#: ../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 "プリセットメニューの並び替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "ユーザ"
 
-#: ../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 "不明な"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
 #, java-format
 msgid ""
@@ -7417,4 +7523,9 @@
 msgstr ""
 "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "<匿名>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7439,4 +7550,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "バージョン {0} 作成日: {1} 作成者: {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "削除しました"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "バージョン {0} 作成日: {1} 作成者: {2}"
 
@@ -7790,8 +7916,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] "{0}個のオブジェクトを変更:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7872,13 +7999,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
@@ -7951,5 +8078,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}..."
@@ -7961,5 +8088,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 "ジオタグのついた画像"
@@ -7985,5 +8112,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"
@@ -8037,43 +8164,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ポイント"
 
 #: ../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 "線描画のカスタマイズ"
 
 #: ../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 "全体設定を使用"
 
 #: ../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 "このレイヤーの点の間に線を引く。"
 
 #: ../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 "このレイヤーの点の間に線を引かない。"
 
 #: ../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 "線描画オプションの選択"
 
 #: ../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 "配色のカスタマイズ"
 
 #: ../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"
@@ -8081,6 +8208,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"
@@ -8167,10 +8294,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../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 "データレイヤーへ変換"
 
-#: ../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."
@@ -8181,43 +8308,43 @@
 "てください："
 
-#: ../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 "{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 "このトラックに沿ってOSMからダウンロード"
 
-#: ../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 "次の範囲内の全てをダウンロード:"
 
-#: ../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} メータ"
 
-#: ../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 "リクエストあたりの最大面積："
 
-#: ../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} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8228,9 +8355,9 @@
 "すか？</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 "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../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 "
@@ -8240,5 +8367,5 @@
 "に変更又は移動されました。"
 
-#: ../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 "
@@ -8273,5 +8400,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8282,9 +8409,8 @@
 "server."
 msgstr[0] ""
-"{0} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセットか"
-"ら放棄されました。"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8293,39 +8419,40 @@
 "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
 "Dialog and manually resolve them."
-msgstr[0] "競合リストダイアログを見て<br>手動で解決してください。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "ダイアログを閉じてJOSMでの編集に戻る"
-
-#: ../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}は削除されました)"
-
-#: ../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}は次からなります:"
 
-#: ../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バージョン: {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 "GPXレイヤーの変換"
 
-#: ../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."
@@ -8336,5 +8463,5 @@
 "よ :</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8342,10 +8469,10 @@
 msgstr[0] "トラック"
 
-#: ../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"
 msgstr[0] "ポイント"
 
-#: ../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"
@@ -8353,5 +8480,5 @@
 msgstr[0] "{0}ポイントをもつトラック"
 
-#: ../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"
@@ -8359,5 +8486,5 @@
 msgstr[0] "{1}トラックを含む {0}"
 
-#: ../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"
@@ -8365,14 +8492,14 @@
 msgstr[0] "{0} ポイント"
 
-#: ../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マーカー"
 
-#: ../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"
 msgstr[0] "マーカー"
 
-#: ../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"
@@ -8380,9 +8507,9 @@
 msgstr[0] "{0}は、{1}マーカーからなる"
 
-#: ../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 "音声の同期"
 
-#: ../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."
@@ -8391,5 +8518,5 @@
 "す。"
 
-#: ../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
@@ -8397,14 +8524,14 @@
 msgstr "地点 {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 "再生されているレイヤーと同期させることができません。"
 
-#: ../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 "再生の最初に音声マーカーを作成します。"
 
-#: ../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 "
@@ -8412,13 +8539,13 @@
 msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
 
-#: ../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 "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
 
-#: ../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 "テキスト/アイコンの表示/非表示"
 
-#: ../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 "マーカーテキストとアイコンの表示状態を切り替え"
@@ -8486,5 +8613,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 "編集する列を選択してください。"
@@ -8498,5 +8625,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."
@@ -9184,7 +9311,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "有効化"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9227,17 +9353,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "結合された要素のリストから選択したエントリを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "すべてのオブジェクトの選択したキーの値の編集"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "結合された要素のリストから選択したエントリを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9247,38 +9370,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "新しいタグを追加"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "選択済みの開かれた変更セットを閉じる"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "選択したソースの編集"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "ノード {0} の履歴をロード中"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>データのアップロード先またはダウンロード元Failed to upload data to or "
-"download data from<br>''{0}''<br>で、データ転送中に問題が発生したために処理が"
-"失敗しました。<br>詳細(原文): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "属性 ''{0}'' に不正な値。入力値: ''{1}''。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -9288,5 +9405,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
-msgstr "事前設定のタグ付け"
+msgstr "タグ付けプレセット"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183
@@ -9510,5 +9627,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "タグの事前設定ソース {0} を読み込めません。"
+msgstr "タグ付けプレセットのソース {0} を読み込めません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
@@ -9549,10 +9666,10 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "プレセットグループ {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "プレセットグループ {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
@@ -9907,5 +10024,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}''."
@@ -9932,5 +10049,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}."
@@ -9938,5 +10055,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}"
@@ -9950,5 +10067,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}''."
@@ -10105,5 +10222,5 @@
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10114,39 +10231,39 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
-#: ../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 "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
 
-#: ../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 "ウェイ {1} の<nd>上に必要な属性 ''{0}'' がありません。"
 
-#: ../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 "要素 <nd> の属性 ''ref'' に不正な値。入力値: {0}。"
 
-#: ../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 ""
 "要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
 
-#: ../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 "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
-#: ../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 "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
-#: ../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 "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10155,19 +10272,19 @@
 "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
 
-#: ../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 "ref=0の不完全な<member>指定です。"
 
-#: ../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 "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
-#: ../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 "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 ""
@@ -10178,9 +10295,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 ""
@@ -10192,25 +10309,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 "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
-#: ../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 "ID {0} のOSM プリミティブ「の属性 ''version'' がありません"
 
-#: ../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 "必要な属性 ''{0}'' がありません。"
 
-#: ../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 "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
 #, java-format
 msgid ""
@@ -10219,5 +10336,5 @@
 "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10228,5 +10345,5 @@
 "ドが見つからないため、不完全です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10235,5 +10352,5 @@
 "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10244,13 +10361,13 @@
 "しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "OSMデータ解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "データセット準備中..."
@@ -10405,9 +10522,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} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10474,7 +10591,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "プラグインのアップデート"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10620,35 +10736,4 @@
 "{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 "不明な"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -10786,11 +10871,9 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
 msgstr ""
-"<html>サーバから競合検出の報告がありました。<br>エラーメッセージ(未翻訳):<br>"
-"{0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
@@ -11324,47 +11407,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 "EXIFからGPS位置を取得"
 
-#: ../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 "ディレクトリ走査の開始"
 
-#: ../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 "選択したファイルはのひとつはヌルでした !!!"
-
-#: ../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 "写真を取り込む"
 
-#: ../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 "標準的なディレクトリへのパスを入手できません {0}\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 "ディレクトリ {0} を走査"
 
-#: ../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 "ディレクトリ {0}に中身のないファイルが見つかりました\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 "ディレクトリからファイルを入手中のエラー {0}\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 "GPXに関連づける"
 
-#: ../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."
@@ -11380,24 +11462,24 @@
 msgstr "新規レイヤーとして画像セットを読み込む."
 
-#: ../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ファイル(*.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 "ファイル {0} は、\"{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 "{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 "\"{0}\"を読み込めません。"
 
-#: ../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."
@@ -11409,34 +11491,34 @@
 "を読み取って、タイムゾーンを選択します。<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 "写真の時刻(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の時刻: "
 
-#: ../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 "タイムゾーンの選択: "
 
-#: ../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 "日付なし"
 
-#: ../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 "他の写真を開く"
 
-#: ../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 "GPSレシーバーの写真から時刻を同期"
 
-#: ../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"
@@ -11446,29 +11528,29 @@
 "入力する形式を確認してください。"
 
-#: ../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 "不正な日付"
 
-#: ../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 "<GPXトラックがまだ読み込まれていません>"
 
-#: ../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トラック: "
 
-#: ../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 "ほかのGPXトレースを開く"
 
-#: ../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 "タイムゾーン: "
 
-#: ../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 "オフセット:"
 
-#: ../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 ""
@@ -11476,41 +11558,41 @@
 "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 "次の場所を更新： "
 
-#: ../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 "すべての画像"
 
-#: ../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 "exif位置のついていない画像"
 
-#: ../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 "まだタグ付けされていない画像"
 
-#: ../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 "GPXトラックに画像を関連づけます。"
 
-#: ../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 "関連付け"
 
-#: ../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 "自動推測"
 
-#: ../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 "GPXトラックを選択しなければなりません"
 
-#: ../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 "GPXトラックの選択がありません"
 
-#: ../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 ""
@@ -11521,9 +11603,9 @@
 "期待する形式: {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 "不正なタイムゾーン"
 
-#: ../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 ""
@@ -11534,26 +11616,26 @@
 "期待されるフォーマット: {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 "不正なオフセット"
 
-#: ../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 "GPX トラック {2} に、{1}中に{0}枚発見しました。"
 
-#: ../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トラックが読み込まれました"
 
-#: ../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 "選択した写真には時間情報がありません"
 
-#: ../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 "写真は時間情報を含んでいません。"
 
-#: ../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."
@@ -11562,39 +11644,39 @@
 "してください。"
 
-#: ../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トラックは、時間情報を持っていません。"
 
-#: ../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 "タイムゾーン: {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 "分: {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 "秒: {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}／{1} 枚の写真がGPXトラックにマッチしました。"
 
-#: ../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 "(時差 {0} 日)"
 
-#: ../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 "トラックと写真の間には、時差があります。: {0}分 {1}秒"
 
-#: ../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 "
@@ -11604,13 +11686,13 @@
 "合できます。"
 
-#: ../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 "トラックへのフォトマッチに失敗しました。"
 
-#: ../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 "タイムゾーンとオフセットを調整してください。"
 
-#: ../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 "デフォルトの値"
@@ -11631,5 +11713,5 @@
 msgstr "ファイル{0}にエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11644,37 +11726,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 "ファイルの読み込みエラー"
 
-#: ../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 "Lambert Zone 1 cache file (.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 "Lambert Zone 2 cache file (.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 "Lambert Zone 3 cache file (.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 "Lambert Zone 4 cache file (.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: 不正な url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11688,18 +11770,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 "コミューンの選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "選択..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
@@ -11731,34 +11813,34 @@
 "コード: {0}"
 
-#: ../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 "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 "グレーカラーの反転 (黒い背景用)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "背景を透明に設定。"
 
-#: ../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 "ダウンロードデータの境界を描画"
 
-#: ../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 "自動キャッシュを有効にする"
 
-#: ../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 "最大キャッシュサイズを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."
@@ -11775,18 +11857,18 @@
 "CU_01_ConditionsGenerales_fr.html</a>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "French cadastre 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 "<html>可能な場合、キー  \"source\" の値を自動化</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "情報ソース"
 
-#: ../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 "
@@ -11794,5 +11876,5 @@
 msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
 
-#: ../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). "
@@ -11801,74 +11883,74 @@
 "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "複数レイヤーの重ね合わせを許可します。"
 
-#: ../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 "WMSレイヤーを透明にします。右が不透明、左が透明です。"
 
-#: ../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 "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。"
 
 #. 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 "より小さい画像を取得してください。(より高品質だがよりメモリを使う)"
 
-#: ../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 "固定サイズ正方形（初期値は100メートル）"
 
-#: ../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 "固定サイズ（25～1000メートル）"
 
-#: ../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 "このサイズを超えると古いファイルは自動的に削除されます"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "自動タグのソースを追加しました。:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "\"source=...\" を要素に追加しますか？"
 
-#: ../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}"
 
-#: ../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 "WMSサーバに接続中..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "建物の作成"
 
-#: ../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"
@@ -11878,31 +11960,31 @@
 "インポートする範囲を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 ""
 "自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください"
 
-#: ../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を取り出し..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "境界に最もフィットする抽出..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "行政区画の作成"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "cadastre WMS に接続中 ..."
 
-#: ../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"
@@ -11912,29 +11994,29 @@
 "通常のCadastre 取得メニューを使用。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "都道府県界、市町村界の抽出"
 
-#: ../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 "ベクターのレイヤー上だけです。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "建物のフットプリントの抽出"
 
-#: ../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 "フランスのCadastre WMSからイメージのダウンロード"
 
-#: ../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"
@@ -11946,13 +12028,13 @@
 "やり直してください"
 
-#: ../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"
@@ -11960,5 +12042,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"
@@ -11968,14 +12050,14 @@
 "(二箇所必要)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../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:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 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"
@@ -11985,14 +12067,14 @@
 "（２つのポイントが必要）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../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:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "２番目の地理参照用ランベルトcrosspiece をクリック"
 
-#: ../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"
@@ -12002,64 +12084,64 @@
 "それとも単にやり直しますか "
 
-#: ../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 "cadastre の東、北の位置を入力"
 
-#: ../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 "{0} ランベルト座標にセット"
 
-#: ../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 "ランベルトゾーン"
 
-#: ../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 "キャッシュから位置を読み込む(もしキャッシュが可能な場合)"
 
-#: ../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 "ロケーションの変更"
 
-#: ../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 "次のリクエスト用に、新規の位置をセットしてください。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "新規レイヤーを追加"
 
-#: ../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 "ロケーション"
 
-#: ../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 "
@@ -12069,25 +12151,25 @@
 "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 "新規レイヤーを作成"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "クッキーのリセット"
 
-#: ../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 "新しい cookie を入手してください(セッションがタイムアウトしました)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "PNG ファイル (*.png)"
 
-#: ../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 "PNG 形式でエクスポート(ラスター画像のみ)"
 
-#: ../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
@@ -12096,14 +12178,14 @@
 msgstr[0] "ウェイの簡素化 ( {0} このノードを削除)"
 
-#: ../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の調整"
 
-#: ../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"
@@ -12111,5 +12193,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
@@ -12117,5 +12199,5 @@
 msgstr "{0}からWMSタイルのダウンロード"
 
-#: ../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"
@@ -12125,34 +12207,34 @@
 "最初にそのひとつを選んで、やり直してください"
 
-#: ../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 "ブランクのレイヤー"
 
-#: ../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レイヤー ({0}), {1}このタイル読み込み"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
 
-#: ../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 "ラスターサイズ: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "ベクタライズされました。"
 
-#: ../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 "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12163,9 +12245,9 @@
 "であるべきです"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "キャッシュフォーマットエラー"
 
-#: ../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}"
@@ -12173,9 +12255,9 @@
 "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "ランベルトゾーンキャッシュエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12284,9 +12366,9 @@
 msgstr "複製したウェイの作成"
 
-#: ../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 "GPSトラックを編集するためのレイヤーです。"
 
-#: ../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 "匿名時間も含めたGPXレイヤーへのコンバート"
@@ -12303,11 +12385,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 "GPXレイヤーからパスをインポート"
 
 #: ../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 "今あるパスをドロップ"
@@ -12317,5 +12399,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 "GPXデータのレイヤーがありません"
@@ -12529,5 +12611,5 @@
 msgstr "ジオタグのない写真を表示"
 
-#: ../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 "インポートした画像"
@@ -12955,5 +13037,5 @@
 msgstr "選択した二つのノード間の角度"
 
-#: ../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 "測定するレイヤー"
@@ -13032,5 +13114,5 @@
 msgstr "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に報告された問題点を表示"
@@ -13176,7 +13258,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "レイヤー"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13346,43 +13427,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 "スリッピーマップ"
 
-#: ../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 "自動ズーム: "
-
-#: ../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 "タイルの読み込み"
 
-#: ../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 "情報を表示"
-
-#: ../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 "全てのタイルをロード"
 
-#: ../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 "ズームアップ"
 
-#: ../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 "ズームダウン"
 
-#: ../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 "画像 "
@@ -13418,7 +13497,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "最大ズーム lvl: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13550,5 +13628,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr "まず、設定情報にある現在のソースのタグを指定してください。"
+msgstr "まず、設定情報にあるタグ付けプレセットのソースを指定してください。"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -13768,6 +13846,6 @@
 msgstr "よろしいですか？"
 
-#: ../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
@@ -13775,5 +13853,5 @@
 msgstr "妥当性検証エラー"
 
-#: ../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 "妥当性検証エラー"
@@ -13864,5 +13942,5 @@
 msgstr "その他を検証"
 
-#: ../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}"
@@ -13962,7 +14040,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "順序付いていない海岸線"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13994,18 +14071,18 @@
 msgstr "交差するウェイ"
 
-#: ../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 "ノードの複製"
 
-#: ../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 "このテストは全く同じ位置にノードがないことをチェックします。"
 
-#: ../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 "確認"
@@ -14161,80 +14238,80 @@
 #. 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 "色つけに問題発生"
 
-#: ../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 "キー ''{0}''は不正です。"
 
-#: ../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 "値のないタグ"
 
-#: ../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 "プロパティキーが不正です"
 
-#: ../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 "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../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 "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../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 "HTML書式の値を持つプロパティ"
 
-#: ../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 "キー ''{0}'' はプリセットにはありません。"
 
-#: ../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 "プリセットはプロパティキーを含みません。"
 
-#: ../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 "値 ''{0}'' キー ''{1}'' はプリセットにはありません。"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
+msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../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 "FIXMES"
 
-#: ../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 "プロパティのキーをチェック"
 
-#: ../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 "ワードのリストをチェックしてプロパティキーが正しいか検証。"
 
-#: ../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 "高度なプロパティチェッカーを使用"
 
-#: ../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 "混合ルールを使用しているプロパティの値とタグを検証"
 
-#: ../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 "タグチェッカーのソース"
 
-#: ../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."
@@ -14244,86 +14321,86 @@
 "index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。"
 
-#: ../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 "新しいソースをリストに追加"
 
-#: ../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 "選択したソースの編集"
 
-#: ../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 "リストから選択した情報源を削除"
 
-#: ../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 "データソース"
 
-#: ../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 "プロパティの値をチェック"
 
-#: ../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 "プリセットをチェックしてプロパティの値が正しいか検証。"
 
-#: ../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 "FIXMEをチェック"
 
-#: ../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 "プロパティの値としてFIXMEをもつノードやウェイを検索"
 
-#: ../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 "Check for paint notes."
 
-#: ../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 "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#: ../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 "既定のデータファイルを使用。"
 
-#: ../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 "既定のデータファイルを使用(推奨)"
 
-#: ../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 "既定のスペルチェックファイルを使用"
 
-#: ../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 "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../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 "プロパティを修正"
 
-#: ../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 "要素タイプを見つけられませんでした。"
 
-#: ../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 "警告レベルを見つけられませんでした"
 
-#: ../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 "不正な表現\"{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}''"
@@ -14500,17 +14577,17 @@
 "クしています。"
 
-#: ../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 "ウェイは他の高速道路の近くでノードで終わっています。"
 
-#: ../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 "ウェイは他のウェイの近くでノードで終わっています。"
 
-#: ../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 "ほかのウェイに近いウェイのノード"
 
-#: ../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 "他のウェイの近くに結合されたウェイ"
@@ -14563,13 +14640,13 @@
 msgstr "このテストは水域、陸地および海岸線ウェイの方向をチェックします。"
 
-#: ../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 "海岸線の反転: 陸地が左側にありません。"
 
-#: ../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 "水域の反転： 陸地は左側にない"
 
-#: ../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 "陸地の反転：　陸地は左側にない"
@@ -14605,7 +14682,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 レイヤー ({0}), 自倍率 {1} でダウンロード"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14613,82 +14690,67 @@
 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"
-msgstr "ジャンクションに到達"
+#: ../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 "ダウンロード"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "地図データをOSMサーバからダウンロード"
+
+#: ../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>統合元のレイヤー<br>''{0}''<br>を、統合する先のレイヤーがありません。</"
+"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 "重複したノードの削除中…"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "例外が発生しました"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "ヘルプ"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "ヘルプ/情報"
-
-#: ../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 ""
-"WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
-"ニューに表示されます。\n"
-"\n"
-"高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\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"
-"フル WMS URL 入力フォーマット例 (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連する "
-"'id' を入力するだけです。\n"
-"Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のような"
-"URL を生成してください、73 のところはあなたの画像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"
-"お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでください。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "WMSプラグイン　ヘルプ"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14796,28 +14858,28 @@
 "間違った座標にたどりつく可能性があります。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../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 "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../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 レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../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 レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14831,13 +14893,13 @@
 "設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
-#: ../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 "不正なURL？"
 
-#: ../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"
@@ -14845,42 +14907,42 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../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レイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
@@ -19351,14 +19413,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "遺跡（群）"
+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 "遺跡（群）の編集"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27328,116 +27388,110 @@
 msgstr "チェコ UHUL:ORTOFOTO"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "データがロードされていないので検索できません。"
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "前のバージョンがありません。履歴は空です。"
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "最新のバージョンがありません。履歴は空です。"
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "種別が見つかりません。履歴は空です。"
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "このデータセットには id {0} のプリミティブはありません"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "このデータセットには id {0} バージョン {1} のプリミティブはありません"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "ウェイ終端の開始ノードを選択"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "ラインの終端に到達"
+
+#~ msgid "Reached a junction"
+#~ msgstr "ジャンクションに到達"
+
+#~ msgid "help"
+#~ msgstr "ヘルプ"
+
+#~ msgid "Help / About"
+#~ msgstr "ヘルプ/情報"
+
+#~ 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 ""
+#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
+#~ "ニューに表示されます。\n"
+#~ "\n"
+#~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\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"
+#~ "フル WMS URL 入力フォーマット例 (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連す"
+#~ "る 'id' を入力するだけです。\n"
+#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のよう"
+#~ "なURL を生成してください、73 のところはあなたの画像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"
+#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでくださ"
+#~ "い。"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "WMSプラグイン　ヘルプ"
+
+#~ msgid "Move"
+#~ msgstr "移動"
+
 #~ msgid "File could not be found."
 #~ msgstr "ファイルは存在しませんでした。"
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "OSM API へのアップロード失敗"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "競合中のリレーション"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
-#~ "す。<br>リレーションから削除しますか?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
-#~ "ションから削除しますか？</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "解析中にエラー"
-
-#~ msgid "File not found"
-#~ msgstr "ファイルが見つかりません"
-
-#~ msgid "Replace"
-#~ msgstr "置換"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr ""
-#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+#~ msgid "No data imported."
+#~ msgstr "データーはインポートされませんでした。"
+
+#~ msgid "Data Layer"
+#~ msgstr "データレイヤー"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "最初にブックマークを選択してください、"
 
 #~ msgid "Please enter the desired coordinates first."
 #~ msgstr "最初に目的の座標を入力してください。"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "最初にブックマークを選択してください、"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "検索文字列を入力してください"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "地名検索結果をサーバから読み取ることができませんでした"
-
-#~ msgid "name"
-#~ msgstr "名前"
-
-#~ msgid "zoom"
-#~ msgstr "ズーム"
-
-#~ msgid "Copy defaults"
-#~ msgstr "デフォルトをコピー"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "コピーする列を選択してください。"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "リストに新しいXML ソースを追加。"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "デフォルト(詳細はツールチップ参照)"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
-#~ "warntime'を編集することで変更できます）"
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
-#~ "geometry にフォールバックします。詳細: {1}"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "タイルの状態を表示"
-
-#~ msgid "Request Update"
-#~ msgstr "要求の更新"
-
-#~ msgid "error loading metadata"
-#~ msgstr "メタデータの読み込みエラー"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
-
-#~ msgid "requested: {0}"
-#~ msgstr "要求: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "アップデート要求時にエラー"
-
-#~ msgid "Move"
-#~ msgstr "移動"
-
-#~ msgid "No data imported."
-#~ msgstr "データーはインポートされませんでした。"
-
-#~ msgid "Data Layer"
-#~ msgstr "データレイヤー"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -27518,4 +27572,16 @@
 #~ "す。"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "検索文字列を入力してください"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "地名検索結果をサーバから読み取ることができませんでした"
+
+#~ msgid "name"
+#~ msgstr "名前"
+
+#~ msgid "zoom"
+#~ msgstr "ズーム"
+
 #~ msgid "Revert"
 #~ msgstr "取り消す"
@@ -27538,4 +27604,10 @@
 #~ msgid "OSM username (email)"
 #~ msgstr "OSMユーザ名（email）"
+
+#~ msgid "Error while parsing"
+#~ msgstr "解析中にエラー"
+
+#~ msgid "File not found"
+#~ msgstr "ファイルが見つかりません"
 
 #~ msgid ""
@@ -27600,4 +27672,19 @@
 #~ msgstr "TCXファイルをインポート"
 
+#~ msgid "Show Tile Status"
+#~ msgstr "タイルの状態を表示"
+
+#~ msgid "Request Update"
+#~ msgstr "要求の更新"
+
+#~ msgid "error loading metadata"
+#~ msgstr "メタデータの読み込みエラー"
+
+#~ msgid "requested: {0}"
+#~ msgstr "要求: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "アップデート要求時にエラー"
+
 #~ msgid "Select Tableau d'Assemblage"
 #~ msgstr "Tableau d'Assemblageを選択"
@@ -27714,4 +27801,7 @@
 #~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "コピーする列を選択してください。"
+
 #~ msgid "board"
 #~ msgstr "board"
@@ -27740,4 +27830,7 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "ウェイが全て空です。"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
 
 #~ msgid "viaduct"
@@ -27825,4 +27918,7 @@
 #~ msgid_plural "{0} objects have conflicts:"
 #~ msgstr[0] "{0} 個のオブジェクトが競合しています:"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "競合中のリレーション"
 
 #~ msgid "There were conflicts during import."
@@ -27988,4 +28084,11 @@
 
 #~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+#~ "warntime'を編集することで変更できます）"
+
+#~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
 #~ "primitives only"
@@ -28065,6 +28168,16 @@
 #~ msgstr "サーバから現在選択されたプリミティブを更新"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "OSM API へのアップロード失敗"
+
 #~ msgid "Conflict detected"
 #~ msgstr "競合が検出されました"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
+#~ "ションから削除しますか？</html>"
 
 #~ msgid "Primitive already deleted"
@@ -28088,6 +28201,22 @@
 #~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
 
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "デフォルト(詳細はツールチップ参照)"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "リストに新しいXML ソースを追加。"
+
+#~ msgid "Copy defaults"
+#~ msgstr "デフォルトをコピー"
+
 #~ msgid "Purging 1 primitive"
 #~ msgstr "1 つのプリミティブを破棄"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
+#~ "す。<br>リレーションから削除しますか?</html>"
 
 #~ msgid "removing reference from way {0}"
@@ -28099,4 +28228,7 @@
 #~ "た。"
 
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
+
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''"
@@ -28107,4 +28239,7 @@
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "必要な属性 ''{0}'' がありません"
+
+#~ msgid "Replace"
+#~ msgstr "置換"
 
 #~ msgid ""
@@ -28159,4 +28294,11 @@
 #~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
 
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
+#~ "geometry にフォールバックします。詳細: {1}"
+
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
@@ -28171,7 +28313,14 @@
 #~ msgstr "{0} 経由ノード。"
 
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
+
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "経由ノード {0}, {1}"
 
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr ""
+#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+
 #~ msgid "MIddle way: {0}"
 #~ msgstr "中間のウェイ: {0}"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 18508)
+++ applications/editors/josm/i18n/po/nb.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-09-22 15:16+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-09 01:48+0000\n"
+"Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\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:23+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"
@@ -110,5 +110,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Kunne ikke lese fil ''{0}''.<br> Feilen er: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:465
@@ -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 "Feil"
@@ -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"
@@ -298,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Fortsett"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
@@ -312,5 +313,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
@@ -328,6 +329,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
@@ -338,5 +339,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
@@ -455,5 +456,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
@@ -495,5 +496,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
@@ -502,6 +503,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"
@@ -687,5 +689,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
@@ -698,5 +700,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"
@@ -768,34 +770,42 @@
 #: ../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
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
+msgstr "Parameter ''{0}'' kan ikke vœre null"
+
+#: ../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 "Det oppstod {0} konflikter under import."
 
-#: ../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
+msgstr "Konflikter under nedlasting"
+
+#: ../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}"
@@ -828,14 +838,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
-msgstr ""
+msgstr "Alle formater"
 
 #: ../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 "Eksporter til 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 "Eksporter dataene til GPX-fil."
@@ -848,11 +858,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
@@ -883,5 +892,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
@@ -896,17 +904,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
@@ -942,5 +951,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr ""
+msgstr "Objekthistorie"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
@@ -966,5 +975,5 @@
 msgstr "Inkluder node i nærmeste linjesegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Sammenføy node og linje"
@@ -995,20 +1004,19 @@
 msgstr "Velg minst to noder til å samle"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Avbryter …"
-
-#: ../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 ikke samle noder. Ville ha måttet slette en linje som er i bruk."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1100,10 +1108,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
-msgstr ""
+msgstr "Åpner filer"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
-msgstr ""
+msgstr "Åpner fil ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
@@ -1142,14 +1150,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
+msgstr "Start nedlasting av data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Steng dialog og avbryt nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Laster ned data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1197,5 +1204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
+msgstr "Bruk"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
@@ -1296,10 +1303,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 "Lagre"
 
 #: ../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 "Lagre gjeldende data."
@@ -1356,10 +1363,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 "Lagre som …"
 
 #: ../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 "Lagre aktive data i ny fil."
@@ -1400,25 +1407,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 "Lukk"
 
-#: ../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 "Splitt linje"
 
-#: ../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 "Splitt en linje i den valgte noden."
 
-#: ../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 "Kan ikke splitte med dette utvalget"
 
-#: ../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."
@@ -1426,5 +1433,5 @@
 msgstr[1] "Valgte noder er ikke del av en linje."
 
-#: ../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 "
@@ -1436,9 +1443,9 @@
 msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
 
-#: ../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 "Valgte noder er ikke på samme linje."
 
-#: ../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."
@@ -1446,10 +1453,10 @@
 msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
 
-#: ../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 "Velg to eller fler noder for å splitte sirkelformet linje."
 
-#: ../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 "
@@ -1459,5 +1466,5 @@
 "linjen.)"
 
-#: ../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 "
@@ -1465,5 +1472,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 "
@@ -1471,5 +1478,5 @@
 msgstr ""
 
-#: ../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"
@@ -1499,37 +1506,37 @@
 msgstr "Dupliser noder som er med i flere linjer."
 
-#: ../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 "Denne noden har ikke knytninger"
 
-#: ../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 "Ingen av disse nodene har knytninger."
 
-#: ../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 "Ingen noder i denne linjen har andre knytninger."
 
-#: ../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 "Valgte element har ikke knytninger som kan løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Velg:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* En node med egenskaper, eller"
 
-#: ../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 "– En node som brukes av flere linjer, eller"
 
-#: ../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 "– En node som er brukt av flere linjer, og en av linjene, eller"
 
-#: ../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"
@@ -1537,10 +1544,10 @@
 "– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
-#: ../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."
 msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
-#: ../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"
@@ -1553,9 +1560,9 @@
 "kopier og alle noder bli valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Node uten tilknytning"
 
-#: ../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"
@@ -1563,5 +1570,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"
@@ -1599,15 +1606,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
-msgstr ""
+msgstr "Oppdater data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Tegn omrisset av data hentet fra tjeneren."
+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 ""
@@ -1623,6 +1629,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Oppdater utvalg"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1636,5 +1643,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Det er ingen valgte objekter å oppdatere"
 
@@ -1643,8 +1651,13 @@
 msgstr "Utvalget er tomt"
 
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Oppdater utvalg"
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
-msgstr ""
+msgstr "Last opp data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1712,5 +1725,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
-msgstr ""
+msgstr "Konflikter avdekkeet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
@@ -1741,5 +1754,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr ""
+msgstr "Forbereder konfliktløsing"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
@@ -1795,12 +1808,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Endre {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1917,9 +1930,9 @@
 msgstr "Laster ned GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Laster ned data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1927,7 +1940,7 @@
 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 ""
+msgstr "Ingen data funnet i dette området"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
@@ -1938,10 +1951,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
 msgid "Updating data"
-msgstr ""
+msgstr "Oppdaterer data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "synlig (på tjeneren)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1957,7 +1969,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Klikk for å fjerne plassering"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1981,7 +1992,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Følgende feil oppsto under nedlasting:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -1991,7 +2002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Feil under nedlasting"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2005,5 +2015,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
@@ -2036,6 +2046,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 "valgt"
@@ -2053,26 +2063,26 @@
 msgstr "Legg til node i linje"
 
-#: ../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 "Knytt eksisterende linje til node"
 
-#: ../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 "Legg til en node i eksisterende linje"
 
-#: ../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 "Legg til node i linje og lag tilknytning"
 
-#: ../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 "Lag ny node."
 
-#: ../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 "Veg node under pekeren."
 
-#: ../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."
@@ -2081,46 +2091,44 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../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 ny linje fra siste 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 "Fortsett samme linje fra siste node."
 
-#: ../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 "Avslutt tegning."
 
-#: ../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 "Trekk ut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Tegn områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Trekk ut linje"
 
-#: ../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 "Slipp museknappen for å velge objektene i rektangelet."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen."
 
-#: ../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 "Slipp museknappen for å avslutte rotasjon."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Dra et linjesegment for å lage et rektangel."
 
@@ -2177,4 +2185,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Slipp museknappen for å velge objektene i rektangelet."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2183,4 +2195,8 @@
 "Slipp museknappen for å avslutte flytting. Bruk Ctrl for sammenføying til "
 "nærmeste node."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Slipp museknappen for å avslutte rotasjon."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2211,67 +2227,70 @@
 "piltaster; flytt utsnitt med høyre museknapp"
 
-#: ../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 "Søk …"
 
-#: ../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 "Søk etter objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Skriv inn søketekst."
 
-#: ../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 "regulært uttrykk"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "erstatt utvalg"
 
-#: ../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 "legg til i utvalg"
 
-#: ../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 "fjern fra utvalg"
 
-#: ../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 "skill mellom store/små bokstaver"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regulært uttrykk"
 
-#: ../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>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
-#: ../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>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
-#: ../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:Nan</b> – «Nan» finnes innen navnet."
 
-#: ../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> – nøkkel «type» med eksakt verdi «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>, "
@@ -2281,57 +2300,56 @@
 "<b>*=value</b>, <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:Nan</b> – «Nan» finnes ikke innen navnet."
 
-#: ../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> – nøkkel «foot» med hvilken som helst verdi."
 
-#: ../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>Spesialsøk:</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> – type objekt (<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>user:</b>… – alle objekter redigert av angitt bruker"
 
-#: ../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>… – objekt med angitt antall noder"
 
-#: ../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>… – objekt med angitt antall noder"
-
-#: ../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 endrede objekter"
 
-#: ../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 objekter i utvalg"
 
-#: ../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 uferdige objekter"
 
-#: ../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>untagged</b> – alle objekter uten egenskaper"
 
-#: ../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"
@@ -2339,5 +2357,5 @@
 "<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
-#: ../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"
@@ -2345,9 +2363,9 @@
 "<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
-#: ../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 "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
-#: ../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 ""
@@ -2355,9 +2373,9 @@
 "«:»)"
 
-#: ../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 "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
-#: ../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
@@ -2367,51 +2385,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 "Søk"
 
-#: ../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 søk"
 
-#: ../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 "Fant ingen treff for «{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 "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../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 "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../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 "Fant {0} treff"
 
-#: ../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"
@@ -2461,16 +2479,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Feil antall parametere for nodes-operator."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
-"intervall, for eksempel nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2591,6 +2606,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
@@ -2715,5 +2730,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 ""
@@ -2734,9 +2749,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}» må ha en verdi"
+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"
@@ -2772,5 +2790,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 "Splitt linje i segment"
@@ -2778,6 +2796,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."
@@ -2789,5 +2807,5 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2798,5 +2816,15 @@
 msgstr "Løs slettekonflikt i {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"
@@ -2882,5 +2910,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 +3015,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 "Standardverdien er «{0}»."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3168,5 +3202,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 +3214,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 ""
@@ -3187,4 +3221,43 @@
 "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 "NOT mangler argument."
+
+#: ../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
+#, fuzzy, 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 ""
+"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element "
+"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne "
+"selvmotsigelsen. Beholder lokalt element. "
 
 #. translators notes must be in front
@@ -3241,32 +3314,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Feil: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advarsel: {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 "Denne historikken har ikke noe element med versjon {0}"
-
-#: ../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 "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
-
-#: ../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}» > 0 forventet – leste «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "Fant ingen første versjon. Historikken er tom."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "Fant ingen siste versjon. Historikken er tom."
-
-#: ../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 "Fant ikke noe objekt med ID {0} i dette datasettet"
-
-#: ../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 "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
-
-#: ../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 "Parameter «{0}» > 0 forventet – leste «{1}»."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
 
@@ -3350,148 +3408,145 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../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 "Linje for areal er ikke lukket."
 
-#: ../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 "multipolygon-linje «{0}» er ikke lukket."
 
-#: ../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 "Slettet medlem «{0}» i relasjon."
 
-#: ../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 "Linje «{0}» med færre enn to punkter."
 
-#: ../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 "Fant mer enn én linje med «from»."
 
-#: ../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 "Fant mer enn én linje med «to»."
 
-#: ../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 "Fant mer enn én \"via\"."
 
-#: ../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 "Ukjent rolle «{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 "Ukjent medlemstype for «{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 "Fant ingen linje med «from»."
 
-#: ../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 "Fant ingen linje med «to»."
 
-#: ../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 "Fant ingen node eller linje med «via»."
 
-#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-node."
 
-#: ../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 "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../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 "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../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 "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../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 "Fant ikke stil for restriksjon {0}."
 
-#: ../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 "Skjæring mellom linjene «{0}» og «{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 "Indre linje «{0}» er utenfor."
 
-#: ../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 "Ingen fornuftig rolle «{0}» for linje «{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 "Multipolygon-medlem «{0}» er ikke en linje."
 
-#: ../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 "Ingen ytre linje for multipolygon «{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 "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../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 "Stil for ytre linje «{0}» passer ikke."
 
-#: ../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 "Uten egenskaper"
 
-#: ../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 ""
-"Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens element "
-"med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne "
-"selvmotsigelsen. Beholder lokalt element. "
-
-#: ../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 "Feil: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advarsel: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../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
@@ -3501,5 +3556,5 @@
 msgstr[1] "noder"
 
-#: ../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
@@ -3509,6 +3564,6 @@
 msgstr[1] "linjer"
 
-#: ../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
@@ -3518,13 +3573,13 @@
 msgstr[1] "relasjoner"
 
-#: ../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 "Llinje uten egenskaper"
 
-#: ../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 "Linje ikke ferdig"
 
-#: ../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
@@ -3532,5 +3587,5 @@
 msgstr "bakgrunn"
 
-#: ../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 "fremhevet"
@@ -3614,5 +3669,5 @@
 msgstr "Ikke vis igjen"
 
-#: ../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
@@ -3620,32 +3675,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 "uferdig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "ferdselsvei"
 
-#: ../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 "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vannvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "bruk av grunn"
 
-#: ../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"
@@ -3654,5 +3709,5 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3661,33 +3716,33 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Forhåndsbetingelse brutt"
 
-#: ../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
@@ -3695,9 +3750,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Ukjent vert"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3719,7 +3774,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Lukk vinduet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3917,5 +3971,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 "Endre"
@@ -4041,10 +4095,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 "Laget er ikke i lista."
 
-#: ../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"
@@ -4052,7 +4106,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Nei, avbryt operasjonen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4175,5 +4228,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"
@@ -4182,5 +4235,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"
@@ -4190,5 +4243,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 "Medlemmer"
@@ -4651,5 +4704,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 "Nei, avbryt"
@@ -4709,6 +4762,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 "<ikke angitt>"
@@ -4837,4 +4888,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"
@@ -4931,5 +4983,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"
@@ -4940,5 +4992,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"
@@ -4961,7 +5013,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Sorter valgte relasjonsmedlemmer eller hele listen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -4980,7 +5031,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Last ned medlemer av relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5000,7 +5050,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5067,5 +5116,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
@@ -5159,5 +5208,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"
@@ -5213,11 +5262,11 @@
 msgstr "Vis historikk på alle valgte objekt."
 
-#: ../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
@@ -5225,13 +5274,13 @@
 msgstr "Last inn på nytt"
 
-#: ../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 "Les inn og oppfrisk liste over alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Vis"
 
-#: ../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 ""
@@ -5288,7 +5337,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] "Dette vil endre opptil {0} objekt."
@@ -5296,5 +5344,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 "Nøkkelen blir ikke lagret når den er tom."
 
@@ -5319,4 +5368,11 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
+#: ../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] "Dette vil endre opptil {0} objekt."
+msgstr[1] "Dette vil endre opptil {0} objekt."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5393,60 +5449,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 "Relasjoner"
 
-#: ../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 "Åpne en liste over alle relasjoner"
 
-#: ../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 "Relasjoner: {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 "Åpne en editor for den valgte relasjon"
 
-#: ../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 "Slet valgt relasjon"
 
-#: ../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 "Oprett ny relasjon"
 
-#: ../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 "Slet valgt relasjon"
-
-#: ../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 "Velg:"
-
-#: ../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 "Slet valgt relasjon"
-
-#: ../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 "Last ned medlemmer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5601,5 +5653,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}"
@@ -5838,18 +5890,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 ""
@@ -5872,5 +5924,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}"
@@ -5952,12 +6004,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Lag avgrensing"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Flytt valgt medlem ned"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5968,7 +6018,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 "Tast inn et navn for stedet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5978,12 +6027,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Flytt valgte medlem opp"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Flytt valgte medlem opp"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6043,7 +6090,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Splitt en linje i den valgte noden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6052,7 +6098,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Valgt linje inneholder ikke valgt node."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6076,7 +6121,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Ingen relasjoner er valgt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6094,12 +6138,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Flytt valgte medlem opp"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Velg raden som skal endres"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6115,7 +6157,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Gi et stednavn å søke etter:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6129,12 +6170,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Søk …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Retning for søk etter land"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7064,7 +7103,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "nær"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7109,5 +7147,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 ""
@@ -7121,5 +7159,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 ""
@@ -7130,5 +7168,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 ""
@@ -7137,19 +7175,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 ""
@@ -7159,32 +7197,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 ""
@@ -7206,37 +7244,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 "Lukk vinduet"
 
-#: ../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 "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
-#: ../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 ""
@@ -7244,5 +7282,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 ""
@@ -7252,9 +7290,9 @@
 "historikken."
 
-#: ../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 "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7265,24 +7303,34 @@
 "tilgjengelig i historikken."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Last historikk"
 
-#: ../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}» > 0 forventet – leste «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
+
+#: ../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}"
@@ -7295,4 +7343,22 @@
 msgstr "Node {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoom til problem"
+
+#: ../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 "Last historikk"
+
+#: ../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
@@ -7305,17 +7371,69 @@
 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 "Meny for sortering av innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Bruker"
 
-#: ../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 "ukjent"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
+
+#: ../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 "Anonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7340,4 +7458,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Versjon {0} lagt til {1} av {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "slettet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Versjon {0} lagt til {1} av {2}"
 
@@ -7682,9 +7815,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] "Objekter som endres:"
-msgstr[1] "Objekter som endres:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7764,13 +7897,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
@@ -7837,5 +7970,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}..."
@@ -7847,5 +7980,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 "Geotaggede bilder"
@@ -7871,5 +8004,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"
@@ -7924,43 +8057,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-punkt"
 
 #: ../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 "Tilpass linjetegning"
 
 #: ../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 "Bruk globale indstillinger."
 
 #: ../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 "Tegn linjer mellem punkter i dette laget."
 
 #: ../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 "Tegn ikke linjer mellem punkt i dette laget."
 
 #: ../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 "Velg linjetegnings-innstillinger"
 
 #: ../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 "Tilpass farge"
 
 #: ../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"
@@ -7968,6 +8101,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"
@@ -8057,10 +8190,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 "Konverter til datalag"
 
-#: ../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."
@@ -8070,43 +8203,43 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../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 "Konvertert fra: {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 "Last ned fra OSM langs dette spor"
 
-#: ../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 "Last ned alt innenfor:"
 
-#: ../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} meter"
 
-#: ../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 "Max areal per forespørsel:"
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8117,9 +8250,9 @@
 "Ønsker du<br>å fortsette?</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 "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../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 "
@@ -8129,5 +8262,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../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 "
@@ -8189,33 +8322,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} slettet.)"
-msgstr[1] " ({0} slettet.)"
-
-#: ../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} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../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 versjon: {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 "Konvertér til GPX-lag"
 
-#: ../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."
@@ -8223,5 +8356,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"
@@ -8230,5 +8363,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"
@@ -8236,5 +8369,5 @@
 msgstr[1] "punkt"
 
-#: ../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"
@@ -8243,5 +8376,5 @@
 msgstr[1] "et GPS spor med {0} punkt"
 
-#: ../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"
@@ -8250,5 +8383,5 @@
 msgstr[1] "{0} består av {1} GPS spor"
 
-#: ../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"
@@ -8257,9 +8390,9 @@
 msgstr[1] "{0} punkt"
 
-#: ../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-flagg"
 
-#: ../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"
@@ -8267,5 +8400,5 @@
 msgstr[1] "flagg"
 
-#: ../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"
@@ -8274,14 +8407,14 @@
 msgstr[1] "{0} består av {1} flagg"
 
-#: ../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 "Synkroniser lyd"
 
-#: ../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 "Du må sætte lyden på pause når du hører synkroniserings-merket."
 
-#: ../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
@@ -8289,14 +8422,14 @@
 msgstr "Lyd synkronisert i punkt {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 ikke synkronisere i det avspillte lag."
 
-#: ../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 "Sett audio-merke ved avspilnings-start"
 
-#: ../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 "
@@ -8304,13 +8437,13 @@
 msgstr "Du må  pause lyden på det punkt på sporet, hvor du vil ha merket."
 
-#: ../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 "Ingen eksisterende lydmerker i dette lag å forskyve."
 
-#: ../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 "Vis/skjul tekst/ikoner"
 
-#: ../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 "Slå av/på visning av tekst/ikoner"
@@ -8380,5 +8513,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 "Velg raden som skal endres"
@@ -8392,5 +8525,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."
@@ -9082,7 +9215,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Brukt stil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9125,17 +9257,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Rett verdien for den valgte nøkkel for alle objekter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9145,17 +9274,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Legg til nytt lag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Oppfrisk utvalgslisten"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Rediger valgt kilde."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9165,16 +9291,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -9796,5 +9921,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}''."
@@ -9821,5 +9946,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}."
@@ -9827,5 +9952,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}"
@@ -9838,5 +9963,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}''."
@@ -9998,5 +10123,5 @@
 msgstr "Fila «{0}» finnes ikke"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10005,38 +10130,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 ""
@@ -10044,19 +10169,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 "Ufullstendig <member>-spesifikasjon med 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 "Ulovlig objekt med 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 ""
@@ -10067,9 +10192,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 ""
@@ -10079,25 +10204,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 ""
@@ -10105,5 +10230,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10112,5 +10237,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10118,5 +10243,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10125,13 +10250,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 "Klargjør OSM-data …"
 
-#: ../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 ""
@@ -10282,9 +10407,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} programtillegg lastet ned. Start JOSM på nytt."
-msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10346,7 +10471,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Opdater programtillegg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10489,35 +10613,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 "ukjent"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11147,47 +11240,46 @@
 "{0} km/t"
 
-#: ../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 "Leser GPS posisjoner fra EXIF"
 
-#: ../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 "Starter scanning av mapper"
 
-#: ../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 "En av de valgte filene var null (tom)!!!"
-
-#: ../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 "Les bilder"
 
-#: ../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 "Klarte ikke å lage fullstendig sti til mappa  {0}\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 "Scanner mappa {0}"
 
-#: ../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 "Fant tom fil i mappa {0}\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 "Feil ved lesing av fil i mappa {0}\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 "Juster til GPX"
 
-#: ../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."
@@ -11203,24 +11295,24 @@
 msgstr "Last inn bildesett som et nyt lag."
 
-#: ../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 Filer (*.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 "Fila {0} er lastet inn under navnet «{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 "Feil oppsto ved sending av {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 "Klarte ikke lese «{0}»"
 
-#: ../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."
@@ -11231,34 +11323,34 @@
 "<br>Skriv inn tidspunktet og velg tidssone<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 "Tidspunkt for foto (fra 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 tidspunkt (lest i bildet ovenfor): "
 
-#: ../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 "Jeg er i tidssonen: "
 
-#: ../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 "Ingen dato"
 
-#: ../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 "Åpne et annet 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 "Synkroniser tiden fra et bilde på GPS-mottakeren"
 
-#: ../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"
@@ -11268,70 +11360,70 @@
 "Sjekk format"
 
-#: ../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 "Ugyldig dato"
 
-#: ../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 "<Ingen GPX-spor er lastet inn>"
 
-#: ../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-spor: "
 
-#: ../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 "Åpne flere GPX-spor"
 
-#: ../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 "Tidssone: "
 
-#: ../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 "Forskyvning:"
 
-#: ../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>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</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 "Opdater posisjon for: "
 
-#: ../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 bilder"
 
-#: ../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 "Bilder uden EXIF-posisjon"
 
-#: ../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 "Bilder uten egenskaper"
 
-#: ../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 "Jevnfør bilder med GPX spor"
 
-#: ../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 "Jevnfør"
 
-#: ../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 "Automatisk forslag"
 
-#: ../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 "Du bør velge et GPX-spor"
 
-#: ../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 "Intgen GPX-spor er valgt"
 
-#: ../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 ""
@@ -11342,9 +11434,9 @@
 "Forventet format: {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 "Ugyldig tidssone"
 
-#: ../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 ""
@@ -11355,65 +11447,65 @@
 "Forventet format: {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 "Ugyldig forskyvning"
 
-#: ../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 "Fant {0} treff av {1} i GPX spor {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-spor er lagt inn"
 
-#: ../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 "Valgte foto har ikke tidskode."
 
-#: ../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 har ikke tidskode."
 
-#: ../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."
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../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 sporet har ikke tidskoder"
 
-#: ../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 "Tidssone: {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 "Minutter: {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 "Sekunder: {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 "Koplet {0} av {1} foto til GPX spor."
 
-#: ../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 "(Tidsforskjell på {0} dager)"
 
-#: ../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 "Forskyvning mellom spor og foto: {0}m {1}s"
 
-#: ../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 "
@@ -11423,13 +11515,13 @@
 "synkronisere bildene manuelt."
 
-#: ../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 "Klarte ikke å koble foto til sporet"
 
-#: ../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 "Juster tidssone og forskyvning"
 
-#: ../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 "Standardverdier"
@@ -11450,5 +11542,5 @@
 msgstr "Feil i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11461,37 +11553,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 "Feil ved lasting av fil"
 
-#: ../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 "Lambert Zone 1 cache file (.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 "Lambert Zone 2 cache file (.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 "Lambert Zone 3 cache file (.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 "Lambert Zone 4 cache file (.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 "Feil URL for lesing av Matrikkel."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11503,18 +11595,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 "Velg kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Velg fra …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
@@ -11545,34 +11637,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 "Bytt ut original bakgrunn med JOSM bakgrunnfarge."
 
-#: ../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 "Omvend grå farger (for svart bakgrunn)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Sett backgrunn transparent."
 
-#: ../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 "Vis grenser for nedlatede data."
 
-#: ../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 "Aktiviser automatisk mellomlager."
 
-#: ../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. lager størrelse (i 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."
@@ -11589,9 +11681,9 @@
 "<BR>før du laster inn data med dette programtillegget."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "Fransk cadastre 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 ""
@@ -11599,10 +11691,10 @@
 "html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Kilde"
 
-#: ../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 "
@@ -11611,5 +11703,5 @@
 "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM."
 
-#: ../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). "
@@ -11619,75 +11711,75 @@
 "tekst på mørk bakgrunn."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Tillat stabling av flere lag"
 
-#: ../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 "Sett transperens på WMS lag. Høyre: opak, venstre: transparent."
 
-#: ../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 "Trekk et rektangel rundt data lastet ned fra WMS-tjener."
 
 #. 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 "Hent mindre bilder (høyere kvalitet men minnekrevende)"
 
-#: ../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 "Fast kvadrat størrelse (standard er 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 "Fast størrelse (fra 25 til 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 ""
 "De eldste filene blir automatisk slettet når denne størrelsen overskrides"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Automatisk egenskap: kilde er lagt inn:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Legg inn kilde ( source=...) på element?"
 
-#: ../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 "Laster ned {0}"
 
-#: ../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 "Kobler til WMS-tjener …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Lag bygninger"
 
-#: ../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"
@@ -11697,30 +11789,30 @@
 "bygningsimport er maks 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 "Vennligst aktiviser \"auto-sourcing\" og sjekk 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 "Hent ut SVG-ViewBox …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Hent ut beste avgrensing …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Lag avgrensing"
 
-#: ../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"
@@ -11728,29 +11820,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 "Hent kommunens grenser"
 
-#: ../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 "Kun ved vektoriserte lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Hent bygningers avtrykk på bakken"
 
-#: ../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 "Last ned bilder fra fransk Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Fransk 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"
@@ -11759,13 +11851,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"
@@ -11773,5 +11865,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"
@@ -11779,14 +11871,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"
@@ -11794,14 +11886,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"
@@ -11809,64 +11901,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 "Sone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Lambert sone"
 
-#: ../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 "Lst område fra mellomlager (bare hvis mellomlager er aktivt)"
 
-#: ../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 "Bytt område"
 
-#: ../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 "Bruk et nytt områder for neste nedlasting"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Legg til nytt lag"
 
-#: ../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 "Område"
 
-#: ../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 "
@@ -11876,25 +11968,25 @@
 "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 "Legg til nytt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Nullstill cookie"
 
-#: ../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 "Be om ny cookie (Internett sesjon nedkobling)"
 
-#: ../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
@@ -11904,14 +11996,14 @@
 msgstr[1] "Forenkle linjer (fjern {0} noder)"
 
-#: ../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 "Tilpass WMS"
 
-#: ../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 "Juster posisjonen på WMS-laget (kun rasterbilder)"
 
-#: ../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"
@@ -11919,5 +12011,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
@@ -11925,5 +12017,5 @@
 msgstr "Last ned  WMS kartutsnitt fra {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"
@@ -11933,34 +12025,34 @@
 "Velg ett og prøv på nytt"
 
-#: ../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 "Blankt lag"
 
-#: ../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 lag ({0}), {1} kartutsnitt er lastet"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
-#: ../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 "Er vektorisert"
 
-#: ../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 "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11971,9 +12063,9 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../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}"
@@ -11981,9 +12073,9 @@
 "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12090,9 +12182,9 @@
 msgstr "Opprett kopi av linje"
 
-#: ../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 "Lag for redigering av GPX-spor"
 
-#: ../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 "Konverter til GPX lag med anonymisert tid"
@@ -12109,11 +12201,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 "Importer spor fra GPX lag"
 
 #: ../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 "Slett eksisterende sti"
@@ -12123,5 +12215,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 "Fant ikke GPX lag"
@@ -12334,5 +12426,5 @@
 msgstr "Vis foto uten geotag posisjon"
 
-#: ../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 "Importerte bilder"
@@ -12764,5 +12856,5 @@
 msgstr "Vinkel mellom to valgte Noder"
 
-#: ../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 "Målelag"
@@ -12841,5 +12933,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../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 "Vis tema i  OpenStreetBugs"
@@ -12982,7 +13074,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Lag"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13149,43 +13240,41 @@
 msgstr "Gi verdier for vekting"
 
-#: ../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 Map"
 
-#: ../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 "Autozoom: "
-
-#: ../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 "Last Kartbilde"
 
-#: ../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 "Status på kartbilde"
-
-#: ../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 "Hent alle kartbilder"
 
-#: ../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 inn"
 
-#: ../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 ut"
 
-#: ../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 "Tøm bildehurtiglager"
 
-#: ../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 "bilde "
@@ -13221,7 +13310,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max zoom niv: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13575,6 +13663,6 @@
 msgstr "Er du sikker?"
 
-#: ../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
@@ -13582,5 +13670,5 @@
 msgstr "Valideringsfeil"
 
-#: ../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 "Ingen valideringsfeil"
@@ -13671,5 +13759,5 @@
 msgstr "gyldighetssjekk – annet"
 
-#: ../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}"
@@ -13769,7 +13857,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Kystlinje i uorden"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13799,18 +13886,18 @@
 msgstr "Kryssende veier"
 
-#: ../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 "Dobbelt-Noder"
 
-#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../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 ""
@@ -13966,80 +14053,80 @@
 #. 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 "Problem med visning"
 
-#: ../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 "Nøkkel «{0}» er ugyldig."
 
-#: ../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 "Egenskaper uten verdier"
 
-#: ../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 "Ulovlig egenskapsnøkkel"
 
-#: ../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 "Ulovlig mellomrom i Nøkkel"
 
-#: ../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 "Egenskap Verdi starter eller slutter med mellomrom"
 
-#: ../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 "Egenskap Verdi inneholder HTML koding"
 
-#: ../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 "Nøkkel «{0}» finnes ikke i objektmalene"
 
-#: ../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 "Objektmalene inneholder ikke Nøkkelen"
 
-#: ../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 "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
 
-#: ../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 "Objektmalen har ikke Egenskapsverdi"
 
-#: ../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 "FIXMEs"
 
-#: ../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 "Sjekk egenskabsnøkler"
 
-#: ../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 "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste."
 
-#: ../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 "Bruk avansert egenskapskontroll."
 
-#: ../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 "Kontroller egenskapsverdiene med hjelp av avanserte regler."
 
-#: ../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 "Egenskapskontroll-kilde"
 
-#: ../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."
@@ -14049,86 +14136,86 @@
 "org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
-#: ../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 "Tilføy en ny kilde til lista."
 
-#: ../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 "Rediger valgt kilde."
 
-#: ../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 "Slett den valgte kilden fra lista."
 
-#: ../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 "Datakilder"
 
-#: ../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 "Sjekk egenskapsverdier."
 
-#: ../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 "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene."
 
-#: ../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 "Se etter FIXMEs"
 
-#: ../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 "Søker etter noder eller linjer med FIXME i en egenskapsverdi"
 
-#: ../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 "Finn notater om tegning."
 
-#: ../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 "Sjekk etter feil ved opptegning."
 
-#: ../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 "Bruk standard datafil."
 
-#: ../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 "Bruk standard datafil (anbefales)."
 
-#: ../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 "Bruk standard fil for stavekontroll."
 
-#: ../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 "Brug standard fil for stavekontroll (anbefales)."
 
-#: ../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 "Korriger egenskaper"
 
-#: ../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 "Kunne ikke finne element-typen"
 
-#: ../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 "Kunne ikke finne advarsels-niveå"
 
-#: ../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 "Ugyldig uttrykk «{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}''"
@@ -14303,17 +14390,17 @@
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../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 "Sluttnode nær annen ferdselsvei"
 
-#: ../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 "Sluttnode nær annen linje"
 
-#: ../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 "Linjenode nær annen linje"
 
-#: ../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 "Knyttet endenode nær annen linje"
@@ -14364,13 +14451,13 @@
 msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
-#: ../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 "Feil retning på Kystlinje: Land er ikke på venstre side"
 
-#: ../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 "Feil retning på Vannlinje: Land er ikke på venstre side"
 
-#: ../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 "Feil retning på Landlinje: Land er ikke på venstre side"
@@ -14406,7 +14493,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 lag ({0})  laster ned i zoom {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14414,85 +14501,65 @@
 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 "Velg en startnode i enden av en linje"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Nådde slutten av linja"
-
-#. 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"
-msgstr "Nådde et kryss"
+#: ../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 "Last ned"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Last ned kartdata fra OSM-tjeneren."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Fjerner doble noder …"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Det oppsto en feil"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "hjelp"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Hjelp / Om"
-
-#: ../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 ""
-"Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
-"und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
-"\n"
-"Sie können dies in den erweiterten Einstellungen auch manuell nach folgendem "
-"Schema erledigen:\n"
-"wmsplugin.url.1.name=LandSat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE-Karten ...\n"
-"\n"
-"Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
-"\n"
-"Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-"muss nur die relevante ID eingegeben werden.\n"
-"Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
-"manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-"Bild-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"
-"Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht unbedenklich "
-"sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Hjelp WMS tilleggsprogram"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14596,28 +14663,28 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatisk nedlasting"
 
-#: ../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 lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../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 lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14628,55 +14695,55 @@
 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"
 msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Feil Fil Format"
@@ -19135,14 +19202,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Arkeologisk plass"
+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 "Rediger arkeologisk plass"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27111,67 +27176,87 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Filen finnes ikke."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Velg minst én oppgave å laste ned"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Klarte ikke laste opp til OSM-API"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relasjonen har konflikter"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Feil ved tolking"
-
-#~ msgid "File not found"
-#~ msgstr "Fant ikke fila"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Tast inn først de ønskede koordinater."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Velg først et bokmerke"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Skriv inn en søkestreng"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
-
-#~ msgid "name"
-#~ msgstr "navn"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Velg raden du vil kopiere."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Legg til ny XML kilde i liste."
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Denne historikken har ikke noe element med versjon {0}"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "Fant ingen første versjon. Historikken er tom."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "Fant ingen siste versjon. Historikken er tom."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Velg en startnode i enden av en linje"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Nådde slutten av linja"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Nådde et kryss"
+
+#~ msgid "help"
+#~ msgstr "hjelp"
+
+#~ msgid "Help / About"
+#~ msgstr "Hjelp / Om"
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "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 ""
-#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
-#~ "i oppstettet 'pluginmanager.warntime'.)"
-
-#~ msgid "Request Update"
-#~ msgstr "Be op Oppdatering"
-
-#~ msgid "error loading metadata"
-#~ msgstr "feil ved lesing av informasjon om data"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "bestilt: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "feil ved bestilling av oppdatering"
+#~ "Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
+#~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
+#~ "\n"
+#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
+#~ "folgendem Schema erledigen:\n"
+#~ "wmsplugin.url.1.name=LandSat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE-Karten ...\n"
+#~ "\n"
+#~ "Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
+#~ "\n"
+#~ "Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
+#~ "muss nur die relevante ID eingegeben werden.\n"
+#~ "Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
+#~ "manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
+#~ "Bild-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"
+#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
+#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Hjelp WMS tilleggsprogram"
 
 #~ msgid "Move"
@@ -27257,4 +27342,7 @@
 #~ msgstr "Slett {1} {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Relasjonen har konflikter"
+
 #~ msgid "Rotate"
 #~ msgstr "Roter"
@@ -27352,4 +27440,19 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "Vis Opphavsmenn Panel"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Tast inn først de ønskede koordinater."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Velg først et bokmerke"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Skriv inn en søkestreng"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "name"
+#~ msgstr "navn"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -27384,4 +27487,7 @@
 #~ msgstr "Offentlig"
 
+#~ msgid "File could not be found."
+#~ msgstr "Filen finnes ikke."
+
 #~ msgid "Add a new tagging preset source to the list."
 #~ msgstr "Legg til ny Objektmal instilling i lista."
@@ -27432,4 +27538,11 @@
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
+#~ "i oppstettet 'pluginmanager.warntime'.)"
 
 #~ msgid ""
@@ -27494,4 +27607,16 @@
 #~ msgstr ""
 #~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
+
+#~ msgid "Request Update"
+#~ msgstr "Be op Oppdatering"
+
+#~ msgid "requested: {0}"
+#~ msgstr "bestilt: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "feil ved lesing av informasjon om data"
+
+#~ msgid "error requesting update"
+#~ msgstr "feil ved bestilling av oppdatering"
 
 #~ msgid "Import TCX file as GPS track"
@@ -27591,4 +27716,7 @@
 #~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Velg raden du vil kopiere."
+
 #~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
@@ -27660,4 +27788,7 @@
 #~ msgstr "% av lengden:"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Velg minst én oppgave å laste ned"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Åpne i nettleser"
@@ -27698,4 +27829,10 @@
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Kontakter OSM-tjeneren …"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Feil ved tolking"
+
+#~ msgid "File not found"
+#~ msgstr "Fant ikke fila"
 
 #~ msgid ""
@@ -27720,4 +27857,7 @@
 #~ msgstr "Konflikt oppdaget"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Klarte ikke laste opp til OSM-API"
+
 #~ msgid "Primitive already deleted"
 #~ msgstr "Objekt allerede slettet"
@@ -27746,4 +27886,7 @@
 #~ msgid "Error when communicating with server."
 #~ msgstr "Klarte ikke kommunisere med tjener."
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
 
 #~ msgid "Tagging preset sources"
@@ -27849,4 +27992,10 @@
 #~ msgstr "Fjern relasjonsmedlem {0} {1}"
 
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Legg til ny XML kilde i liste."
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
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"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 18508)
+++ applications/editors/josm/i18n/po/pl.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-02 18:18+0000\n"
-"Last-Translator: poczciwy <Unknown>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:31+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -51,18 +51,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
@@ -72,6 +72,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
@@ -79,11 +78,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
@@ -98,4 +97,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"
@@ -122,6 +122,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
@@ -137,7 +137,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
@@ -148,7 +148,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
@@ -174,12 +174,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
@@ -191,6 +191,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 "Błąd"
@@ -211,6 +212,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"
@@ -316,5 +317,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
@@ -332,6 +333,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
@@ -342,5 +343,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
@@ -461,5 +462,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
@@ -501,5 +502,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
@@ -508,6 +509,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"
@@ -695,5 +697,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
@@ -706,5 +708,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"
@@ -778,5 +780,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
@@ -784,28 +794,28 @@
 msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
 
-#: ../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 "Wystąpił/o {0} koflikt/ów podczas importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikty podczas pobierania."
 
-#: ../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}"
@@ -842,10 +852,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 "Eksportuj do 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 "Eksportuj dane do pliku GPX"
@@ -858,11 +868,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
@@ -893,5 +902,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
@@ -906,17 +914,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
@@ -976,5 +985,5 @@
 msgstr "Łączy węzeł z najbliższym odcinkiem drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Połącz węzeł i linię"
@@ -1005,22 +1014,19 @@
 msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Przerywanie..."
-
-#: ../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 ""
-"Nie można scalić węzłów - wymagałoby to usunięcia drogi która jest nadal "
-"używana."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1161,7 +1167,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Pobieranie danych"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1311,10 +1316,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 "Zapisz"
 
 #: ../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 "Zapisuje bieżące dane."
@@ -1371,10 +1376,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 "Zapisz jako..."
 
 #: ../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 "Zapisuje bieżące dane do nowego pliku."
@@ -1416,25 +1421,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 "Zamknij"
 
-#: ../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 "Rozdziel drogę"
 
-#: ../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 "Rozdziela drogę w zaznaczonym węźle."
 
-#: ../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 "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../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."
@@ -1443,5 +1448,5 @@
 msgstr[2] "Wybrane węzły nie są w środku żadnej drogi."
 
-#: ../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 "
@@ -1454,9 +1459,9 @@
 msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę."
 
-#: ../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 "Wybrane węzły nie współdzielą tej samej trasy."
 
-#: ../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."
@@ -1465,10 +1470,10 @@
 msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
 
-#: ../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 "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną."
 
-#: ../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 "
@@ -1478,5 +1483,5 @@
 "węzły w środku drogi.)"
 
-#: ../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 "
@@ -1484,5 +1489,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 "
@@ -1490,5 +1495,5 @@
 msgstr ""
 
-#: ../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"
@@ -1518,33 +1523,33 @@
 msgstr "Powiela węzły które używane są przez różne drogi."
 
-#: ../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 "Ten węzeł nie jest przyklejony do niczego więcej."
 
-#: ../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 "Żaden z tych węzłów nie jest przyklejony do niczego więcej."
 
-#: ../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 "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej."
 
-#: ../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 "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Wybierz przynajmniej:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden węzęł z tagami lub"
 
-#: ../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 "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub"
 
-#: ../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 ""
@@ -1552,5 +1557,5 @@
 "tych dróg lub"
 
-#: ../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 @@
 "drogę, lub"
 
-#: ../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 @@
 "niż jedną drogę."
 
-#: ../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"
@@ -1574,9 +1579,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Rozdzielenie węzła"
 
-#: ../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"
@@ -1584,5 +1589,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"
@@ -1623,12 +1628,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Odświerz obiekty na aktualnej warstwie pobierając z serwera."
+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 ""
@@ -1644,6 +1648,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Aktualizuj zaznaczenie"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1657,5 +1662,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Nie wybrano elementów do odświerzenia."
 
@@ -1663,4 +1669,9 @@
 msgid "Selection empty"
 msgstr "Wybrano zbiór pusty."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Aktualizuj zaznaczenie"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1670,7 +1681,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 "Wyślij wszystkie zmiany w aktualnej warstwie do serwera OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1808,12 +1818,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Zmień {0} obiekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1930,9 +1940,9 @@
 msgstr "Pobrane dane GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Pobieranie danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1940,5 +1950,5 @@
 msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
 
-#: ../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 "Nie znaleziono żadnych danych w tym obszarze."
@@ -1954,7 +1964,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Nazwa użytkownika."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1970,7 +1979,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Kliknij aby przerwać i powrócić do edycji."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1989,7 +1997,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "The following errors occurred during mass download:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -1999,7 +2007,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Błędy podczas pobierania"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2013,5 +2020,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
@@ -2044,6 +2051,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 "zaznaczony"
@@ -2061,26 +2068,26 @@
 msgstr "Dodaj węzeł do drogi"
 
-#: ../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 "Połącz istniejący drogę z węzłem"
 
-#: ../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 "Dodaj nowy węzeł do istniejącej drogi"
 
-#: ../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 "Dodaj węzeł do drogi i połącz"
 
-#: ../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 "Utwórz nowy węzeł."
 
-#: ../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 "Zaznacz węzeł pod kursorem."
 
-#: ../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."
@@ -2089,46 +2096,44 @@
 msgstr[1] "Wstaw w drogę nowe węzły {0}"
 
-#: ../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 "Zacznij nową drogę od ostatniego węzła"
 
-#: ../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 "Kontynuuj drogę od ostatniego węzła."
 
-#: ../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 "Zakończ rysowanie."
 
-#: ../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 "Wytłocz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Tworzenie obszarów."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Wytłocz drogę"
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy."
 
-#: ../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 "Zwolnij przycisk myszy aby zakończyć obracanie."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Narysuj odcinek aby utworzyć prostokąt."
 
@@ -2186,4 +2191,8 @@
 msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2192,4 +2201,8 @@
 "Zwolnij przycisk myszy aby zakończyć przesuwanie. Ctrl aby scalić z "
 "najbliższym węzłem."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2217,68 +2230,71 @@
 "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem"
 
-#: ../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 "Szukaj..."
 
-#: ../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 "Szukaj obiektów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Nie mogę szukać ponieważ nie załadowano danych."
-
-#: ../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 "Podaj proszę czego szukać."
 
-#: ../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 "wyrażenie regularne"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "zamień zaznaczenie"
 
-#: ../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 "dodaj do zaznaczenia"
 
-#: ../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 "usuń z zaznaczenia"
 
-#: ../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 "uwzględnij wielkość liter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "wyrażenie regularne"
 
-#: ../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>Baker Street</b> - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' w dowolnym kluczu lub nazwie."
 
-#: ../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:Bak</b> - 'Bak' gdziekolwiek w nazwie"
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2286,17 +2302,17 @@
 msgstr ""
 
-#: ../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:Bak</b> - brak 'Bak' w nazwie"
 
-#: ../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> - klucz=foot ustawiony na dowolną wartość"
 
-#: ../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 ""
 
-#: ../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>)"
@@ -2304,62 +2320,61 @@
 "<b>type:</b> - rodzaj obiektu (<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>user:</b>... - wszystkie obiekty zmienione przez użytkownika"
 
-#: ../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>... - obiekt z podaną liczbą węzłów"
 
-#: ../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>... - obiekt z podaną liczbą węzłów"
-
-#: ../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> - wszystkie zmienione obiekty"
 
-#: ../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> - wszystkie zaznaczone obiekty"
 
-#: ../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> - wszystkie niekompletne obiekty"
 
-#: ../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>untagged</b> - wszystkie obiekty bez tagów"
 
-#: ../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 "Użyj <b>I</b> lub <b>OR</b> by połączyć logicznym \"lub\""
 
-#: ../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 "Użyj <b>\"</b> aby wpisać operator (np.: jeżeli klucz zawiera :)"
 
-#: ../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 "Użyj <b>(</b> oraz <b>)</b> aby pogrupować wyrażenia"
 
-#: ../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
@@ -2369,51 +2384,51 @@
 msgstr ""
 
-#: ../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 "Szukaj"
 
-#: ../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 "Rozpocznij szukanie"
 
-#: ../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 "Nie znaleziono nic szukając ''{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 "Niczego nie dodano do zaznaczenia szukając \"{0}\""
 
-#: ../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 "Niczego nie usunięto z zaznaczenia szukając \"{0}\""
 
-#: ../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 "Znaleziono {0} pasujących."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2581,6 +2596,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
@@ -2706,5 +2721,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 ""
@@ -2725,9 +2740,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 "Parametr \"{0}\" nie może być pusty (ang. null)"
+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"
@@ -2763,5 +2781,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 "Rozdziel segmenty drogi"
@@ -2769,6 +2787,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."
@@ -2780,5 +2798,5 @@
 "węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Potwierdź usunięcie."
@@ -2789,5 +2807,15 @@
 msgstr ""
 
-#: ../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"
@@ -2869,5 +2897,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"
@@ -2974,8 +3002,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 "Domyślną wartością jest \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3155,5 +3189,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
@@ -3167,5 +3201,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 ""
@@ -3173,4 +3207,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 "Brak argumentu dla operatora nie."
+
+#: ../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 ""
 
@@ -3228,32 +3298,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Błąd: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Uwaga: {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 ""
 
@@ -3278,45 +3349,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 "Parametr \"{0}\" nie może być pusty (ang. null)"
+
+#: ../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
@@ -3327,6 +3381,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 ""
 
@@ -3337,145 +3392,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Nieznana rola \"{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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "nieotagowany"
 
-#: ../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 "Błąd: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Uwaga: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "nieaktywne"
 
-#: ../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
@@ -3486,5 +3541,5 @@
 msgstr[2] "węzłów"
 
-#: ../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
@@ -3495,6 +3550,6 @@
 msgstr[2] "dróg"
 
-#: ../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
@@ -3505,13 +3560,13 @@
 msgstr[2] "relacji"
 
-#: ../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 "nieotagowana droga"
 
-#: ../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 "niekompletna droga"
 
-#: ../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
@@ -3519,5 +3574,5 @@
 msgstr "tło"
 
-#: ../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 "wyróżnienie"
@@ -3596,5 +3651,5 @@
 msgstr "Nie pokazuj ponownie"
 
-#: ../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
@@ -3602,32 +3657,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 "niekompletne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "droga"
 
-#: ../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 "tory kolejowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "szlak wodny"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
 
-#: ../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"
@@ -3637,5 +3692,5 @@
 msgstr[2] "{0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3645,33 +3700,33 @@
 msgstr[2] "{0} elementów"
 
-#: ../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
@@ -3679,9 +3734,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Nieznany adres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3892,5 +3947,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 "Edycja"
@@ -4016,10 +4071,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 "warstwa nie jest na liście."
 
-#: ../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"
@@ -4027,7 +4082,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Kliknij aby przerwać i powrócić do edycji."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4149,5 +4203,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"
@@ -4156,5 +4210,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"
@@ -4164,5 +4218,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 "Członkowie"
@@ -4591,5 +4645,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 ""
@@ -4647,6 +4701,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 ""
@@ -4775,4 +4827,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"
@@ -4869,5 +4922,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"
@@ -4879,5 +4932,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"
@@ -4919,7 +4972,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Podaj wartości dla wszystkich konfliktów."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4939,7 +4991,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5006,5 +5057,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
@@ -5098,5 +5149,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"
@@ -5152,11 +5203,11 @@
 msgstr "Wyświetla historię wszystkich zaznaczonych elementów."
 
-#: ../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
@@ -5164,13 +5215,13 @@
 msgstr "Odśwież"
 
-#: ../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 "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
 
-#: ../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 ""
@@ -5227,7 +5278,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] "Ta operacja może zmienić {0} obiekt."
@@ -5236,5 +5286,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 "Ustawienie wartości na pustą usuwa klucz"
 
@@ -5260,4 +5311,12 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
+#: ../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] "Ta operacja może zmienić {0} obiekt."
+msgstr[1] "Ta operacja może zmienić {0} obiekty."
+msgstr[2] "Ta operacja może zmienić {0} obiektów."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5334,60 +5393,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 "Relacje"
 
-#: ../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 "Otwiera listę wszystkich relacji"
 
-#: ../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 "Relacje: {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 "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../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 "Usuwa zaznaczoną relację."
 
-#: ../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 "Utwórz nową relację"
 
-#: ../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 "Usuwa zaznaczoną relację."
-
-#: ../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 "Wybierz przynajmniej:"
-
-#: ../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 "Usuwa zaznaczoną relację."
-
-#: ../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 "Pobierz członków"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5543,5 +5598,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}"
@@ -5780,18 +5835,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 ""
@@ -5814,5 +5869,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}"
@@ -5894,12 +5949,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Tworzenie obszarów."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5910,7 +5963,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 "Proszę podać nazwę lokalizacji."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5920,12 +5972,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5984,7 +6034,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Rozdziela drogę w zaznaczonym węźle."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5993,7 +6042,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Wybrana droga nie zawiera wybranego węzła."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6017,7 +6065,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Usuń zaznaczoną warstwę."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6032,17 +6079,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Zamknij okno i porzuć pobieranie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Proszę wybrać wiersz do edycji"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6058,7 +6102,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Wpisz nazwę miejsce do odnalezienia:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6072,7 +6115,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Szukaj..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -7006,7 +7048,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "niedaleko"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7051,5 +7092,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 ""
@@ -7063,5 +7104,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 ""
@@ -7072,5 +7113,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 ""
@@ -7079,19 +7120,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 ""
@@ -7101,32 +7142,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 ""
@@ -7148,37 +7189,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 ""
@@ -7186,5 +7227,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 ""
@@ -7192,9 +7233,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 ""
@@ -7203,24 +7244,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}'' nie może być pusty (null)"
+
+#: ../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}"
@@ -7233,4 +7284,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Pokaż problem"
+
+#: ../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 "tablica historyczna"
+
+#: ../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
@@ -7243,17 +7312,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 "Sortuj menu szablonów"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Użytkownik"
 
-#: ../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 "nieznany"
+
+#: ../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 "Anonimowy"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7278,4 +7397,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 "Wersja {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "usunięto"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7620,10 +7754,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] "Obiekty do zmiany:"
-msgstr[1] "Obiekty do zmiany:"
-msgstr[2] "Obiekty do zmiany:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7703,13 +7836,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
@@ -7776,5 +7909,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}..."
@@ -7786,5 +7919,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 "Geolokalizowane obrazy"
@@ -7810,5 +7943,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"
@@ -7864,43 +7997,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 "punkt GPS"
 
 #: ../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 "Dostosuj rysowanie linii"
 
 #: ../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 "Użyj ustawień globalnych."
 
 #: ../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 "Rysuj linie pomiędzy punktami na tej warstwie."
 
 #: ../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 "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
 #: ../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 "Wybierz opcje rysowania linii"
 
 #: ../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 "Dostosuj kolor"
 
 #: ../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"
@@ -7908,6 +8041,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"
@@ -7999,10 +8132,10 @@
 msgstr[2] "{0} punktów"
 
-#: ../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 "Przekształć w warstwę danych"
 
-#: ../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."
@@ -8012,43 +8145,43 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../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 "Przekonwertowany z: {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 "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../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 "Pobierz wszystko pomiędzy:"
 
-#: ../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} metrów"
 
-#: ../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 "Maksymalny obszar na zapytanie:"
 
-#: ../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} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8059,5 +8192,5 @@
 "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 ""
@@ -8065,5 +8198,5 @@
 "danymi dźwiękowymi."
 
-#: ../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 "
@@ -8071,5 +8204,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8113,5 +8246,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8125,41 +8257,38 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Zamknij okno i porzuć pobieranie"
-
-#: ../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} usuniętych.)"
-msgstr[1] " ({0} usuniętych.)"
-msgstr[2] " ({0} usuniętych.)"
-
-#: ../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 "Obiekty na warstwie {0}:"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -8167,5 +8296,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"
@@ -8174,5 +8303,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"
@@ -8181,5 +8310,5 @@
 msgstr[2] "punktów"
 
-#: ../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"
@@ -8189,5 +8318,5 @@
 msgstr[2] "trasa z {0} punktami"
 
-#: ../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"
@@ -8197,5 +8326,5 @@
 msgstr[2] "{0} składa się z {1} ścieżek"
 
-#: ../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"
@@ -8205,9 +8334,9 @@
 msgstr[2] "{0} punktów"
 
-#: ../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 "znacznik GPS"
 
-#: ../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"
@@ -8216,5 +8345,5 @@
 msgstr[2] "znaczników"
 
-#: ../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"
@@ -8224,14 +8353,14 @@
 msgstr[2] "{0} składa się z {1} markerów"
 
-#: ../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 "Synchronizacja dźwięku"
 
-#: ../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 "Musisz włączyć pauzę kiedy usłyszysz wskazówkę do synchronizacji."
 
-#: ../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
@@ -8239,14 +8368,14 @@
 msgstr "Dźwięk zsynchronizowany w punkcie {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 "Nie można zsynchronizować aktualnie odtwarzanej warstwy."
 
-#: ../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 ""
 
-#: ../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 "
@@ -8254,13 +8383,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Pokaż/Ukryj Tekst/Ikony"
 
-#: ../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 "Zmienia widoczność markerów tekstowych i ikon."
@@ -8326,5 +8455,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 "Proszę wybrać wiersz do edycji"
@@ -8338,5 +8467,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."
@@ -9057,12 +9186,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9076,17 +9203,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Dodaj komentarz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Odśwież listę zaznaczonych obiektów."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Usuwa zaznaczoną relację."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9704,5 +9828,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}''."
@@ -9729,5 +9853,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}."
@@ -9735,5 +9859,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}"
@@ -9746,5 +9870,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}''."
@@ -9895,5 +10019,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9902,38 +10026,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 ""
@@ -9941,19 +10065,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 "Niekompletny opis <member> z 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 "Niedozwolony obiekt z 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 ""
@@ -9964,9 +10088,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 ""
@@ -9976,25 +10100,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 ""
@@ -10002,5 +10126,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10009,5 +10133,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10015,5 +10139,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10022,13 +10146,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 "Przygotowywanie danych OSM..."
 
-#: ../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 ""
@@ -10179,11 +10303,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} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM."
-msgstr[1] "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM."
-msgstr[2] ""
-"{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10245,7 +10367,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Aktualizuj wtyczki"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10391,35 +10512,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 "nieznany"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11045,47 +11135,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 "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../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 ""
 
-#: ../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 "Przesuwa wybraną warstwę o jeden wiersz do góry."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Przeglądanie katalogu {0}"
 
-#: ../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 ""
 
-#: ../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 "Bład w czasie pobierania obrazów z katalogu {0}\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 ""
 
-#: ../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."
@@ -11101,24 +11190,24 @@
 msgstr ""
 
-#: ../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 "Pliki GPX (*.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 ""
 
-#: ../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 "Błąd podczas przetwarzania {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 "Nie można odczytać \"{0}\""
 
-#: ../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."
@@ -11127,34 +11216,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Brak daty"
 
-#: ../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 "Otwórz inne zdjęcie"
 
-#: ../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 ""
 
-#: ../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"
@@ -11164,69 +11253,69 @@
 "Proszę użyć wybranego formatu."
 
-#: ../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 "Nieprawidłowa data"
 
-#: ../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 ""
 
-#: ../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 "Scieżka GPX: "
 
-#: ../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 ""
 
-#: ../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 "Strefa czasowa: "
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Aktualizuj pozycję dla: "
 
-#: ../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 "Wszystkie obrazy"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11235,9 +11324,9 @@
 msgstr ""
 
-#: ../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 "Nieprawidłowa strefa czasowa"
 
-#: ../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 ""
@@ -11246,65 +11335,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Ślad GPX wczytany"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11312,13 +11401,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11339,5 +11428,5 @@
 msgstr "Błąd w pliku {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11350,37 +11439,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 "Błąd podczas ładowania pliku"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11392,18 +11481,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11430,34 +11519,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11469,18 +11558,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS katastru francuskiego"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11488,5 +11577,5 @@
 msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
 
-#: ../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). "
@@ -11494,74 +11583,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11569,30 +11658,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11600,29 +11689,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 "Kataster: {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"
@@ -11631,13 +11720,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"
@@ -11645,5 +11734,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"
@@ -11651,14 +11740,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"
@@ -11666,14 +11755,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"
@@ -11681,64 +11770,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11746,25 +11835,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11775,14 +11864,14 @@
 msgstr[2] "Uprość drogę (usuń {0} węzly)"
 
-#: ../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 ""
 
-#: ../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"
@@ -11790,5 +11879,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
@@ -11796,5 +11885,5 @@
 msgstr ""
 
-#: ../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"
@@ -11802,34 +11891,34 @@
 msgstr ""
 
-#: ../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 "Pusta warstwa"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11838,18 +11927,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11956,9 +12045,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11975,11 +12064,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 ""
 
 #: ../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 ""
@@ -11989,5 +12078,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 ""
@@ -12197,5 +12286,5 @@
 msgstr ""
 
-#: ../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 "Wczytane obrazy"
@@ -12617,5 +12706,5 @@
 msgstr "Kąt pomiędzy dwoma wybranymi węzłami"
 
-#: ../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 ""
@@ -12694,5 +12783,5 @@
 msgstr ""
 
-#: ../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 "Wyświetla problemy z OpenStreetBugs"
@@ -12831,7 +12920,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Warstwa"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12995,42 +13083,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 "Mapa \"Slippy\""
 
-#: ../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 "Powiększ"
-
-#: ../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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13066,7 +13153,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "powiększenie"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13411,6 +13497,6 @@
 msgstr "Czy na pewno?"
 
-#: ../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
@@ -13418,5 +13504,5 @@
 msgstr "Błędy poprawności"
 
-#: ../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 "Sprawdzanie poprawności przebiegło pomyślnie"
@@ -13505,5 +13591,5 @@
 msgstr "pozostałe informacje z sprawdzania poprawności"
 
-#: ../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}"
@@ -13603,7 +13689,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Niepołączone drogi."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13633,18 +13718,18 @@
 msgstr "Przecinające się drogi"
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13797,80 +13882,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "DO POPRAWKI"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13878,86 +13963,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14132,17 +14217,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14193,13 +14278,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14243,18 +14328,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 "Pobierz"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Pobiera dane mapy z serwera OSM."
+
+#: ../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>Nie ma warstw, z którymi można by połączyć warstwę "
+"źródłową<br>''{0}''<br>.</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 "Powielone węzły drogi"
+
+#: ../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 ""
 
@@ -14262,43 +14391,4 @@
 msgid "Exception occurred"
 msgstr "Wystąpił wyjątek"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "pomoc"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Pomoc / Informacje"
-
-#: ../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 "Pomoc wtyczki WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14402,28 +14492,28 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14434,55 +14524,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Zmiana rozdzielczości"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Błędny format pliku"
@@ -18906,14 +18996,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Wykopaliska archeologiczne"
+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 "Edycja wykopalisk archeologicznych"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26882,139 +26970,126 @@
 msgstr ""
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych."
+
+#~ msgid "help"
+#~ msgstr "pomoc"
+
+#~ msgid "Help / About"
+#~ msgstr "Pomoc / Informacje"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Pomoc wtyczki WMS"
+
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
 #~ msgid "File could not be found."
 #~ msgstr "Plik nie został odnaleziony."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Załadunek do API OSM się nie udał."
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niezapisane zmiany"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Nieznana wersja"
+
+#~ msgid "true"
+#~ msgstr "prawda"
+
+#~ msgid "false"
+#~ msgstr "fałsz"
+
+#~ msgid "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Błąd podczas przetwarzania"
+
+#~ msgid "name"
+#~ msgstr "nazwa"
+
+#~ msgid "my version:"
+#~ msgstr "moja wersja:"
+
+#~ msgid "their version:"
+#~ msgstr "ich wersja:"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nie można połączyć się z serwerem."
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Wycofaj"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Użytkownik OSM (email)"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Używa szablon \"{0}\""
+
+#~ msgid "position"
+#~ msgstr "pozycja"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Usuń {1} {0}"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
+
+#~ msgid "zoom"
+#~ msgstr "powiększenie"
+
+#~ msgid "Validate"
+#~ msgstr "Zweryfikuj"
+
+#~ msgid "Station"
+#~ msgstr "stacja"
+
+#~ msgid "Edit Station"
+#~ msgstr "Edycja stacji"
+
+#~ msgid "Charge"
+#~ msgstr "Opłata"
+
+#~ msgid "No data imported."
+#~ msgstr "Nie zaimportowano danych."
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Błąd w czasie ładowania strony {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Otwórz w przeglądarce"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Pomoc JOSM w sieci"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Wybierz najpierw zakładkę."
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Sprzeczne relacje"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Błąd podczas przetwarzania"
-
-#~ msgid "File not found"
-#~ msgstr "Plik nie został odnaleziony"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Proszę wcześniej podać wybrane współrzędne."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Wybierz najpierw zakładkę."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Wpisz proszę czego szukać"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
-
-#~ msgid "name"
-#~ msgstr "nazwa"
-
-#~ msgid "zoom"
-#~ msgstr "powiększenie"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
-#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
-
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niezapisane zmiany"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Nieznana wersja"
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "my version:"
-#~ msgstr "moja wersja:"
-
-#~ msgid "their version:"
-#~ msgstr "ich wersja:"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Wycofaj"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Używa szablon \"{0}\""
-
-#~ msgid "position"
-#~ msgstr "pozycja"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Usuń {1} {0}"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
-
-#~ msgid "Validate"
-#~ msgstr "Zweryfikuj"
-
-#~ msgid "Station"
-#~ msgstr "stacja"
-
-#~ msgid "Edit Station"
-#~ msgstr "Edycja stacji"
-
-#~ msgid "Charge"
-#~ msgstr "Opłata"
-
-#~ msgid "No data imported."
-#~ msgstr "Nie zaimportowano danych."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Błąd w czasie ładowania strony {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otwórz w przeglądarce"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Pomoc JOSM w sieci"
 
 #~ msgid "rectifier id={0}"
@@ -27074,4 +27149,11 @@
 #~ msgid "Ill-formed node id"
 #~ msgstr "Zły format identyfikatora węzła"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
+#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
 
 #~ msgid "Error parsing server response."
@@ -27120,4 +27202,10 @@
 #~ msgstr "Wybrano tylko jeden węzeł"
 
+#~ msgid "File not found"
+#~ msgstr "Plik nie został odnaleziony"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Proszę wcześniej podać wybrane współrzędne."
+
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Błąd podczas usuwania wtyczki: {0}"
@@ -27177,4 +27265,7 @@
 #~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość."
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Wpisz proszę czego szukać"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
@@ -27225,4 +27316,7 @@
 #~ msgid "board"
 #~ msgstr "tablica informacyjna"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
 
 #~ msgid "Remove Selected"
@@ -27318,4 +27412,7 @@
 #~ msgstr "Rodzaj tablicy"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
+
 #~ msgid ""
 #~ "No data to update found. Have you already opened or downloaded a data "
@@ -27354,4 +27451,7 @@
 #~ msgid "Conflict detected"
 #~ msgstr "Wykryto konflikt"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Załadunek do API OSM się nie udał."
 
 #~ msgid "Unknown file extension for file ''{0}''"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 18508)
+++ applications/editors/josm/i18n/po/pt_BR.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-11-03 09:50+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:28+0000\n"
 "Last-Translator: billymenzl <billymenzl@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:05+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 "Erro"
@@ -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
@@ -463,5 +464,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
@@ -503,5 +504,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
@@ -510,6 +511,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"
@@ -697,5 +699,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
@@ -708,5 +710,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"
@@ -779,5 +781,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
@@ -785,28 +795,28 @@
 msgstr ""
 
-#: ../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 "Houve {0} conflitos durante a importação."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Conflitos durante download"
 
-#: ../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}"
@@ -843,10 +853,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 "Exportar para 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 "Exportar dados para arquivo GPX."
@@ -859,11 +869,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
@@ -894,5 +903,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
@@ -907,17 +915,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
@@ -978,5 +987,5 @@
 msgstr "Unir um nó ao segmento de caminhos mais próximo"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Unir Nó e Linha"
@@ -1007,21 +1016,19 @@
 msgstr "Por favor selecione no mínimo dois nós para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Interrompendo..."
-
-#: ../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 ""
-"Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1162,7 +1169,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Baixando dados"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1314,10 +1320,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 "Salvar"
 
 #: ../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 "Salvar dados atuais"
@@ -1374,10 +1380,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 "Salvar como..."
 
 #: ../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 "Salvar os dados atuais para um novo arquivo."
@@ -1420,25 +1426,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 "Fechar"
 
-#: ../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 "Dividir Caminho"
 
-#: ../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 "Dividir caminho no nó selecionado"
 
-#: ../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 "A seleção atual não pode ser usada para divisões"
 
-#: ../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."
@@ -1446,5 +1452,5 @@
 msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho"
 
-#: ../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 "
@@ -1460,9 +1466,9 @@
 "o caminho também."
 
-#: ../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 "Os nós selecionados não compartilham o mesmo caminho."
 
-#: ../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."
@@ -1470,11 +1476,11 @@
 msgstr[1] "O caminho selecionado não contém todos nós selecionados."
 
-#: ../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 ""
 "Você precisa selecionar dois ou mais nós para dividir um caminho circular."
 
-#: ../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 "
@@ -1484,5 +1490,5 @@
 "no meio do caminho.)"
 
-#: ../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 "
@@ -1492,5 +1498,5 @@
 "caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
-#: ../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 "
@@ -1500,5 +1506,5 @@
 "<br>Deverá verificar isto e corrigir quando necessário.</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"
@@ -1528,37 +1534,37 @@
 msgstr "Duplicar nós que são usados em caminhos múltiplos"
 
-#: ../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 "Este nó não esta grudado a nada."
 
-#: ../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 "Nenhum destes nós está grudado a algo."
 
-#: ../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 "Nenhum dos nós destes caminhos está grudado a algo."
 
-#: ../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 "A seleção atual não pode ser usada para desgrudar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecione entre:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Um nó comentado, ou"
 
-#: ../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 "* Um nó que é usado em mais de um caminho, ou"
 
-#: ../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 "* Um nó que é usado em mais de um caminho e um destes caminhos, ou"
 
-#: ../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"
@@ -1566,5 +1572,5 @@
 "* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou"
 
-#: ../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."
@@ -1572,5 +1578,5 @@
 "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho."
 
-#: ../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"
@@ -1585,9 +1591,9 @@
 "cópia e todos os nós serão selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nó não grudado"
 
-#: ../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"
@@ -1595,5 +1601,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"
@@ -1634,12 +1640,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Atualiza as primitivas selecionadas a partir do servidor"
+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 ""
@@ -1655,6 +1660,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Atualizar Seleção"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1668,5 +1674,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Não há primitivas selecionadas para atualizar."
 
@@ -1674,4 +1681,9 @@
 msgid "Selection empty"
 msgstr "Seleção vazia"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Atualizar Seleção"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1827,14 +1839,12 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Modificar objeto {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"A ignorar a excepção porque a transferência foi cancelada. A excepção foi: "
-"{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1951,9 +1961,9 @@
 msgstr "Dados GPX baixados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Baixando dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1963,5 +1973,5 @@
 "{0}"
 
-#: ../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 ""
@@ -1977,7 +1987,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "visível (no servidor)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2017,7 +2026,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Os seguintes erros ocorrem aquando um transferencia em massa:{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2027,7 +2036,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Erros ao Transferir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2041,5 +2049,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
@@ -2072,6 +2080,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 "selecionado"
@@ -2089,26 +2097,26 @@
 msgstr "Adicionar nó no caminho"
 
-#: ../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 "Conectar caminho existente a nó"
 
-#: ../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 "Adicionar um novo nó a um caminho existente"
 
-#: ../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 "Adicionar nó em um caminho e conectar"
 
-#: ../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 "Criar novo nó."
 
-#: ../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 "Selecionar nó sob o 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."
@@ -2117,47 +2125,46 @@
 msgstr[1] "Inserir novo nó em {0} caminhos."
 
-#: ../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 "Começar novo caminho a partir do último nó."
 
-#: ../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 "Continuar caminho a partir do último nó."
 
-#: ../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 "Finalizar desenho."
 
-#: ../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 "Extrudar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Criar áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Extrudar Caminho"
 
-#: ../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 "Solte o botão do mouse para selecionar os objetos no retângulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Marque um retângulo no tamanho desejado, depois solte o botão do mouse."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Marque um retângulo no tamanho desejado, depois solte o botão do mouse."
 
-#: ../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 "Solte o botão do mouse para parar de girar"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Arraste um segmento de caminho para fazer um retângulo"
 
@@ -2217,4 +2224,8 @@
 msgstr "Mover sempre e não mostrar dica outraves"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2223,4 +2234,8 @@
 "Solte o botão do mouse para parar de mover. Ctrl para agregar ao nó mais "
 "próximo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Solte o botão do mouse para parar de girar"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2250,67 +2265,70 @@
 "Abaixo, Direita; mova ampliação com o botão direito"
 
-#: ../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 "Pesquisar..."
 
-#: ../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 "Busca por objetos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Não pode procurar porque não exite informação carregada."
-
-#: ../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 "Por favor, entre com uma string de busca."
 
-#: ../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 "expressão regular"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "susbtitui a seleção"
 
-#: ../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 "adiciona à seleção"
 
-#: ../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 "remove da seleção"
 
-#: ../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 "sensível à caixa alta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "expressão regular"
 
-#: ../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>Rua Augusta</b> - 'Rua' and 'Augusta em qualquer chave ou valor."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' em qualquer chave ou nome."
 
-#: ../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:May</b> - 'Bak' em qualquer parte do nome."
 
-#: ../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> - chave 'type' com valor exato '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>, "
@@ -2320,17 +2338,17 @@
 "b>, <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:Bak</b> - 'Bak' não existe no nome."
 
-#: ../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> - qualquer valor presente na chave=foot"
 
-#: ../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>Destinos especiais:<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>)"
@@ -2338,40 +2356,39 @@
 "<b>type:</b> - tipo de objeto (<b>nó</b>, <b>caminho</b>, <b>relação</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>user:</b>... - todos os objetos modificados por determinado usuário"
 
-#: ../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>nós:</b>... - objeto com um determinado número de nós"
 
-#: ../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>nós:</b>... - objeto com um determinado número de nós"
-
-#: ../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>modificado</b> - todos os objetos modificados"
 
-#: ../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>selecionados</b> - todos os objetos selecionados"
 
-#: ../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>incompletos</b> - todos os objetos incompletos"
 
-#: ../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>não tagueados</b> - todos objetos não tagueados"
 
-#: ../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"
@@ -2379,5 +2396,5 @@
 "<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
 
-#: ../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"
@@ -2386,17 +2403,17 @@
 "expressão"
 
-#: ../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 "Use <b>|</b> ou <b>OR</b> para combinar com \"ou\" lógico"
 
-#: ../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 "Usar <b>\"</b> para operadores de aspas (se a chave contém :)"
 
-#: ../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 "Usar <b>(</b> and <b>)</b> para agrupar expressões"
 
-#: ../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
@@ -2406,51 +2423,51 @@
 msgstr "Filtro"
 
-#: ../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 "Buscar"
 
-#: ../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 "Iniciar Pesquisa"
 
-#: ../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 "Não há valores coincidentes para ''{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 "Nada adicionado à seleção pela busca por \"{0}\""
 
-#: ../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 "Nada foi removido da seleção quando buscado por \"{0}\""
 
-#: ../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 "Encontrados {0} resultados"
 
-#: ../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"
@@ -2504,16 +2521,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Número de parametros incorreto para operador de nós."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Valor incorreto de operador de nós: {0}. O operador de nós espera un número "
-"de nós ou um intervalo, por exemplos, os nós:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2636,6 +2650,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
@@ -2762,5 +2776,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 ""
@@ -2781,9 +2795,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 "parâmetro ''{0}'' não pode ser nulo"
+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"
@@ -2819,5 +2836,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 "Dividir segmento de via"
@@ -2825,6 +2842,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."
@@ -2836,5 +2853,5 @@
 "<br>Realmente quer apagar?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Apagar confirmação"
@@ -2845,5 +2862,15 @@
 msgstr "Resolver conflitos em estado de exclusão em {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"
@@ -2929,5 +2956,5 @@
 msgstr "Resolver {0} conflitos do rotulo na relação {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3034,8 +3061,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 "Valor padrão é \"{0}\"."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "parametro {0} > 0 necessário. Obtido {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3234,5 +3267,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
@@ -3246,5 +3279,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 ""
@@ -3253,4 +3286,43 @@
 "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 "Falta argumento para \"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
+#, fuzzy, 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 ""
+"Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com "
+"versão menor {2} não é visível. Não é possível tratar esta inconsistência. "
+"Mantendo minha primitiva. "
 
 #. translators notes must be in front
@@ -3307,32 +3379,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Erro: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Aviso: {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 ""
 
@@ -3357,47 +3430,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 "Não há primitiva com versão {0} neste histórico"
-
-#: ../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 "Não há versão válida na data ''{0}'' neste histórico"
-
-#: ../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 "parametro {0} > 0 necessário. Obtido {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "não foi encontrada versão anterior. Histórico está vazio."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "não foi encontrada a última versão. Histórico está vazio."
-
-#: ../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 "Não consegui encontrar um primitivo com o id {0} neste dataset."
-
-#: ../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 ""
-"Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto de "
-"dados"
-
-#: ../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
@@ -3408,6 +3462,7 @@
 msgstr "parametro {0} > 0 necessário. Obtido {1}."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "não é possível comparar um primitivo com id ''{0}'' com um primitivo com id "
@@ -3420,148 +3475,145 @@
 msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
 
-#: ../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 "Caminho para Estilo de Área não está fechado."
 
-#: ../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 "via multipolígonos \"{0}\" não está fechada."
 
-#: ../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 "Apagado membro ''{0}'' na relação."
 
-#: ../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 "Way ''{0}'' com menos de dois pontos."
 
-#: ../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 "Mais de um caminho \"de\" encontrado."
 
-#: ../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 "Mais de um caminho \"para\" encontrado."
 
-#: ../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 "Encontrado mais de um parâmetro \"via\"."
 
-#: ../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 "Regra desconhecida \"{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 "Tipo de membro desconhecido para \"{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 "Nenhum caminho \"de\" encontrado."
 
-#: ../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 "Nenhuma caminho \"para\" encontrado."
 
-#: ../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 "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
 
-#: ../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 "O caminho \"de\" não começa ou termina em um nó \"via\"."
 
-#: ../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 "O trecho \"to\" não começa ou termina no nó \"via\""
 
-#: ../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 "O trecho \"from\" não começa ou termina no caminho \"via\""
 
-#: ../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 "O trecho \"to\" não começa ou termina em um nó \"via\"."
 
-#: ../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 "Estilo para restrição {0} não encontrado."
 
-#: ../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 "Interseção entre as vias \"{0}\" e \"{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 "Via interna \"{0}\" está fora."
 
-#: ../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 "Regra não aplicável ''{0}'' para Way ''{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 "\"{0}\" não é um caminho no multipolígono."
 
-#: ../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 "Não há via externa no multipolígono \"{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 "Estilo para caminho interno \"{0}\" é multipolígono."
 
-#: ../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 "Estilo para via externa \"{0}\" contém erros."
 
-#: ../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 "não tagueado"
 
-#: ../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 "texto"
 
-#: ../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 ""
-"Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com "
-"versão menor {2} não é visível. Não é possível tratar esta inconsistência. "
-"Mantendo minha primitiva. "
-
-#: ../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 "Erro: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Aviso: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inativo"
 
-#: ../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
@@ -3571,5 +3623,5 @@
 msgstr[1] "nós"
 
-#: ../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
@@ -3579,6 +3631,6 @@
 msgstr[1] "vias"
 
-#: ../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
@@ -3588,13 +3640,13 @@
 msgstr[1] "relações"
 
-#: ../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 "via não tagueada"
 
-#: ../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 "via incompleta"
 
-#: ../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
@@ -3602,5 +3654,5 @@
 msgstr "segundo plano"
 
-#: ../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 "ressaltar"
@@ -3684,5 +3736,5 @@
 msgstr "Não mostrar novamente"
 
-#: ../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
@@ -3690,32 +3742,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 "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "rodovia"
 
-#: ../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 "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "água"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "uso da terra"
 
-#: ../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"
@@ -3724,5 +3776,5 @@
 msgstr[1] "{0} nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3731,33 +3783,33 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Violação de Pré-condição"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Exceção de segurança"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Exceção de rede"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "Excepção IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../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
@@ -3765,9 +3817,9 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Servidor desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3789,7 +3841,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Fechar a janela"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3988,5 +4039,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 "Editar"
@@ -4112,10 +4163,10 @@
 msgstr "Usuário:"
 
-#: ../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 "camada não está na lista."
 
-#: ../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"
@@ -4123,7 +4174,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Não, cancelar operação"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4247,5 +4297,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"
@@ -4254,5 +4304,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"
@@ -4262,5 +4312,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 "Membros"
@@ -4725,5 +4775,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 "Não, abortar"
@@ -4785,6 +4835,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 "<indefinido>"
@@ -4913,4 +4961,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"
@@ -5007,5 +5056,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"
@@ -5016,5 +5065,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"
@@ -5055,7 +5104,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Definir uma papel para membros selecionados"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5075,7 +5123,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5142,5 +5189,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
@@ -5236,5 +5283,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"
@@ -5290,11 +5337,11 @@
 msgstr "Mostrar histórico de todos itens selecionados."
 
-#: ../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
@@ -5302,13 +5349,13 @@
 msgstr "Recarregar"
 
-#: ../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 "Recarregar todos objetos selecionados e atualizar a lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../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 ""
@@ -5365,7 +5412,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] "Isto modificará {0} objeto."
@@ -5373,5 +5419,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 "Um valor vazio apaga a chave."
 
@@ -5396,4 +5443,11 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
+#: ../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] "Isto modificará {0} objeto."
+msgstr[1] "Isto modificará {0} objetos."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5470,60 +5524,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 "Relações"
 
-#: ../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 "Abrir uma lista de de todas as relações."
 
-#: ../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 "Relações: {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 "Abrir um editor para a relação selecionada"
 
-#: ../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 "Excluir a relação selecionada"
 
-#: ../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 "Criar uma nova relação"
 
-#: ../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 "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
-#: ../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 "Excluir a relação selecionada"
-
-#: ../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 "Selecione entre:"
-
-#: ../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 "Baixar relações selecionadas"
-
-#: ../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 "Baixar membros"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5679,5 +5729,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}"
@@ -5924,18 +5974,19 @@
 msgstr "Editar relação referente à relação selecionada atualmente"
 
-#: ../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 "Zoom para"
 
-#: ../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
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
+msgstr "Editar relação referente à relação selecionada atualmente"
+
+#: ../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 ""
@@ -5958,5 +6009,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}"
@@ -6038,12 +6089,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Criar áreas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Editar relação selecionada atualmente"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6054,7 +6103,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 "Por favor, entre com um nome para a location."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6064,12 +6112,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Mover os membros selecionados para cima"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Mover os membros selecionados para cima"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6129,7 +6175,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Dividir caminho no nó selecionado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6138,7 +6183,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "O caminho selecionado não contém o nó selecionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6162,7 +6206,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Excluir camada selecionada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6181,12 +6224,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Editar relação selecionada atualmente"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Por favor, selecione a linha para editar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6202,7 +6243,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Forneça o nome de um lugar a procurar:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6216,7 +6256,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Pesquisar..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -7150,7 +7189,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "próximo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7195,5 +7233,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 ""
@@ -7207,5 +7245,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 ""
@@ -7216,5 +7254,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 ""
@@ -7223,19 +7261,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 ""
@@ -7245,32 +7283,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 ""
@@ -7292,32 +7330,32 @@
 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 "Fechar a janela"
 
-#: ../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 ""
@@ -7325,6 +7363,6 @@
 "referência."
 
-#: ../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 ""
@@ -7332,5 +7370,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 ""
@@ -7340,9 +7378,9 @@
 "histórico"
 
-#: ../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 "Histórico não inicializado ainda. Falha ao definir primitivo atual."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7352,24 +7390,34 @@
 "Falha ao definir atual. Versão atual {0} não está disponível no histórico"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Carregar histórico"
 
-#: ../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 "parametro {0} > 0 necessário. Obtido {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "parametro {0} > 0 necessário. Obtido {1}."
+
+#: ../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}"
@@ -7382,4 +7430,22 @@
 msgstr "Nó {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zoom para"
+
+#: ../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 "Carregar histórico"
+
+#: ../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
@@ -7392,17 +7458,69 @@
 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 "não apagado"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Usuário"
 
-#: ../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 "Desconhecido"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas "
+"e as deles</html>"
+
+#: ../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 "Anônimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7427,4 +7545,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Verção {0} creado do {2} no {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Versão {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "removido"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Verção {0} creado do {2} no {1}"
 
@@ -7769,9 +7902,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] "{0} objecto a modificar:"
-msgstr[1] "{0} objectos a modificar:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7853,13 +7986,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
@@ -7926,5 +8059,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}..."
@@ -7936,5 +8069,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 "Imagens Geotagueadas"
@@ -7960,5 +8093,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"
@@ -8013,43 +8146,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 "ponto GPS"
 
 #: ../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 "Personalizar linha"
 
 #: ../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 "Usar preferências globais."
 
 #: ../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 "Desenhar linhas entre pontos para esta camada."
 
 #: ../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 "Não desenhar linhas entre pontos para esta camada."
 
 #: ../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 "Selecionar opções de linha"
 
 #: ../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 "Personalizar cores"
 
 #: ../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"
@@ -8057,6 +8190,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"
@@ -8146,10 +8279,10 @@
 msgstr[1] ""
 
-#: ../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 "Converter para camada de dados"
 
-#: ../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."
@@ -8159,43 +8292,43 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../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 (EN)"
 
-#: ../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 "Convertido de: {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 "Descarregar do OSM ao largo desta via"
 
-#: ../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 "Descargar tudo entre:"
 
-#: ../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} metros"
 
-#: ../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 "Área máxima por pedio:"
 
-#: ../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} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8206,9 +8339,9 @@
 "Você deseja </br> continuar? </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 "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../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 "
@@ -8216,5 +8349,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8274,33 +8407,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} apagado.)"
-msgstr[1] " ({0} apagado.)"
-
-#: ../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} consiste em:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "remover definição"
 
-#: ../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 "Versão API: {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 "Converter para camada GPX"
 
-#: ../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."
@@ -8308,5 +8441,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"
@@ -8315,5 +8448,5 @@
 msgstr[1] "trilhas"
 
-#: ../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"
@@ -8321,5 +8454,5 @@
 msgstr[1] "pontos"
 
-#: ../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"
@@ -8328,5 +8461,5 @@
 msgstr[1] "uma trilha com {0} pontos"
 
-#: ../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"
@@ -8335,5 +8468,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8342,9 +8475,9 @@
 msgstr[1] "{0} pontos"
 
-#: ../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 "Marcador gps"
 
-#: ../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"
@@ -8352,5 +8485,5 @@
 msgstr[1] "marcadores"
 
-#: ../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"
@@ -8359,9 +8492,9 @@
 msgstr[1] "{0} consiste em {1} marcadores"
 
-#: ../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 "Sincronizar audio"
 
-#: ../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."
@@ -8370,5 +8503,5 @@
 "sincronização"
 
-#: ../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
@@ -8376,14 +8509,14 @@
 msgstr "Audio sincronizado no ponto {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 "Não foi possível sincronizar na camada sendo reproduzida."
 
-#: ../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 ""
 
-#: ../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 "
@@ -8391,13 +8524,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Mostrar/Esconder Texto/Ícones"
 
-#: ../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 "Alternar visibilidade do marcador de texto e ícones."
@@ -8462,5 +8595,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 "Por favor, selecione a linha para editar."
@@ -8474,5 +8607,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."
@@ -9154,7 +9287,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Ativar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
@@ -9197,17 +9329,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Remover as entradas selecionadas da lista de elementos combinados"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Editar o valor da chave selecionada para todos objetos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Remover as entradas selecionadas da lista de elementos combinados"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -9217,31 +9346,26 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Adicionar uma nova camada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Atualizar lista de seleção"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Editar relação selecionada atualmente"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "A enviar informação para a camada \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html> Falha ao carregar histórico a partir do servidor. Detalhes: <br> {0} "
-"</ html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
@@ -9845,5 +9969,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}''."
@@ -9870,5 +9994,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}."
@@ -9876,5 +10000,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}"
@@ -9887,5 +10011,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}''."
@@ -10036,5 +10160,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10043,38 +10167,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 ""
@@ -10082,19 +10206,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 "Especificação de <member> incompleta com 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 "Objeto ilegal com 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 ""
@@ -10105,9 +10229,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 ""
@@ -10117,25 +10241,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 ""
@@ -10143,5 +10267,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10150,5 +10274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10156,5 +10280,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10163,13 +10287,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 "Preparando dados OSM..."
 
-#: ../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 ""
@@ -10385,7 +10509,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Atualizar Plugins"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10528,35 +10651,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 "Desconhecido"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11181,47 +11273,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 ""
 
-#: ../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 ""
 
-#: ../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 "Mover a camada selecionada uma linha acima."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11237,24 +11328,24 @@
 msgstr "Carregar grupo de imagens como nova camada."
 
-#: ../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 "Arcivo GPX (*.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 ""
 
-#: ../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 "Erro enquanto analisava {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 "Não foi possível ler \"{0}\""
 
-#: ../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."
@@ -11263,34 +11354,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Sem data"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11298,69 +11389,69 @@
 msgstr ""
 
-#: ../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 "Data inválida"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Deslocamento:"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Todas as imagens"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11369,9 +11460,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11380,65 +11471,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11446,13 +11537,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 ""
 
-#: ../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 ""
 
-#: ../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 "Valores Predefinidos"
@@ -11473,5 +11564,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11484,37 +11575,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 "Erro ao carregar arquivo"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11526,18 +11617,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11564,34 +11655,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11603,18 +11694,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "WMS do cadastre Francese"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11622,5 +11713,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11628,9 +11719,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Permitir empilhamento de camadas múltiplas"
 
-#: ../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 ""
@@ -11638,66 +11729,66 @@
 "esquerda é mais transparente."
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 "Baixando {0}"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11705,30 +11796,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11736,29 +11827,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 ""
 
-#: ../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 "Apenas em camadas vetorizadas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11767,13 +11858,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"
@@ -11781,5 +11872,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"
@@ -11787,14 +11878,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"
@@ -11802,14 +11893,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"
@@ -11817,64 +11908,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 "Leste"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Norte"
 
-#: ../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 "Zona"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Zona Lambert"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Adicionar uma nova camada"
 
-#: ../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 "Localidade"
 
-#: ../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 "
@@ -11882,25 +11973,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11910,14 +12001,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11925,5 +12016,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
@@ -11931,5 +12022,5 @@
 msgstr ""
 
-#: ../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"
@@ -11937,34 +12028,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11973,18 +12064,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12091,9 +12182,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -12110,11 +12201,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 ""
 
 #: ../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 ""
@@ -12124,5 +12215,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 ""
@@ -12332,5 +12423,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12752,5 +12843,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12829,5 +12920,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12960,7 +13051,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Layer"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13124,43 +13214,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 Map"
 
-#: ../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 "Ampliar"
-
-#: ../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 ""
 
-#: ../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 "Mostrar informações"
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "imagen "
@@ -13196,7 +13284,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "nível de zoom"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13541,6 +13628,6 @@
 msgstr "Você tem certeza?"
 
-#: ../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
@@ -13548,5 +13635,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13633,5 +13720,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13731,7 +13818,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "costa"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13761,18 +13847,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 "Confirmação"
@@ -13924,80 +14010,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -14005,86 +14091,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Origens de dados"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14259,17 +14345,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14320,13 +14406,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14370,61 +14456,66 @@
 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 "Baixar"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Baixar mapa do servidor OSM."
+
+#: ../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>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</"
+"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 "Unir {0} nós"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14527,28 +14618,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14559,55 +14650,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -19029,14 +19120,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Sítio Arqueológico"
+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 "Editar Sítio Arqueológico"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27005,59 +27094,54 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Arquivo não pode ser encontrado."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Envio para API OSM falhou"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relação conflitando"
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Não pode procurar porque não exite informação carregada."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Não há primitiva com versão {0} neste histórico"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "não foi encontrada a última versão. Histórico está vazio."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr ""
+#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
+#~ "de dados"
+
+#~ msgid "Unknown version"
+#~ msgstr "Versão desconhecida"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Alterações Não Salvas"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotacionar"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Encontrado elemento <nd> em non-way."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Encontrado elemento <member> em non-relation."
 
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
+#~ "required."
 #~ msgstr ""
-#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
-#~ "<br>Apagar da relação?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
-#~ "</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erro enquanto analisando"
-
-#~ msgid "File not found"
-#~ msgstr "Arquivo não encontrado"
-
-#~ msgid "Replace"
-#~ msgstr "Substituir"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Por favor, entre com as coordenadas desejadas primeiro."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecione um favorito primeiro"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Por favor, entre com texto de busca"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copiar padrões"
+#~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
+#~ "mais necessário."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Identificação de nó mal-formada"
 
 #~ msgid ""
@@ -27067,32 +27151,4 @@
 #~ "(Você pode alterar o número de dias depois que este irá "
 #~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
-
-#~ msgid "Unknown version"
-#~ msgstr "Versão desconhecida"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Alterações Não Salvas"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotacionar"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> em non-way."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrado elemento <member> em non-relation."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
-#~ "mais necessário."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Identificação de nó mal-formada"
 
 #~ msgid "<nd> has zero ref"
@@ -27135,4 +27191,25 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "Relação conflitando"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Por favor, entre com texto de busca"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, entre com as coordenadas desejadas primeiro."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecione um favorito primeiro"
+
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
@@ -27195,4 +27272,7 @@
 #~ msgstr "Combinar conflitos"
 
+#~ msgid "File could not be found."
+#~ msgstr "Arquivo não pode ser encontrado."
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Alguns dos nós estão (praticamente) na linha"
@@ -27206,4 +27286,7 @@
 #~ msgid "Those nodes are not in a circle."
 #~ msgstr "Estes nós não estão em um círculo"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
 
 #~ msgid "JOSM Online Help"
@@ -27290,4 +27373,7 @@
 #~ msgstr "Faltando número de versão nos dados dos mapas"
 
+#~ msgid "File not found"
+#~ msgstr "Arquivo não encontrado"
+
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -27314,4 +27400,7 @@
 #~ msgid "Upload to OSM..."
 #~ msgstr "Enviar para o OSM..."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Envio para API OSM falhou"
 
 #~ msgid ""
@@ -27425,4 +27514,7 @@
 #~ "Não faça o upload de nenhuma informação depois desta mensagem."
 
+#~ msgid "Error while parsing"
+#~ msgstr "Erro enquanto analisando"
+
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "parâmetro '{0}' não pode ser nulo"
@@ -27436,4 +27528,7 @@
 #~ msgid "History item"
 #~ msgstr "Historia do iten"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar padrões"
 
 #~ msgid "Public"
@@ -27515,2 +27610,19 @@
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Mostrar histórico da primitiva selecionada"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
+#~ "</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
+#~ "<br>Apagar da relação?</html>"
+
+#~ msgid "Replace"
+#~ msgstr "Substituir"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 18508)
+++ applications/editors/josm/i18n/po/ro.po	(revision 18656)
@@ -8,7 +8,7 @@
 "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:41+0000\n"
-"Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-15 17:49+0000\n"
+"Last-Translator: Cezar Radu-Buterez <rbcaesar@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -51,18 +51,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
@@ -72,6 +72,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
@@ -79,11 +78,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
@@ -98,4 +97,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"
@@ -122,6 +122,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
@@ -137,7 +137,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
@@ -148,7 +148,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
@@ -174,12 +174,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
@@ -191,6 +191,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 "Eroare"
@@ -211,6 +212,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"
@@ -258,5 +259,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
-msgstr "Revizia"
+msgstr "Revizie"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
@@ -266,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
-msgstr ""
+msgstr "Licență"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
@@ -272,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
-msgstr "Module"
+msgstr "Extensii"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
@@ -302,5 +303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Continuă"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
@@ -316,5 +317,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
@@ -332,6 +333,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
@@ -342,5 +343,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
@@ -352,5 +353,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Cancel"
-msgstr "Renunţă"
+msgstr "Anulează"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118
@@ -362,9 +363,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Vă rog selectați stratul țintă"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
-msgstr ""
+msgstr "Selectați stratul țintă"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
@@ -372,5 +373,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
-msgstr ""
+msgstr "Fuzionează"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -461,5 +462,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
@@ -501,5 +502,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
@@ -508,9 +509,10 @@
 #: ../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"
-msgstr ""
+msgstr "Informaţii"
 
 #. Do it!
@@ -672,9 +674,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
-msgstr ""
+msgstr "Creează Cerc"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
-msgstr ""
+msgstr "Creează un cerc din trei noduri selectate."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
@@ -687,9 +689,11 @@
 "three nodes."
 msgstr ""
+"Selectează te rog exact două sau trei noduri sau o cale cu exact două sau "
+"trei noduri."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java: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
@@ -702,5 +706,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"
@@ -709,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
-msgstr ""
+msgstr "Șterge obiectele selectate."
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
@@ -772,5 +776,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
@@ -778,28 +790,28 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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}"
@@ -810,5 +822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplicare"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
@@ -832,14 +844,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
-msgstr ""
+msgstr "Toate Formatele"
 
 #: ../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:288
+msgid "Export to GPX..."
+msgstr "Exportă ca GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
-msgid "Export to GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportă datele într-un fişier GPX."
@@ -852,11 +864,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
@@ -887,5 +898,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
@@ -900,17 +910,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
@@ -941,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
-msgstr ""
+msgstr "Exportă fișier GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
@@ -955,5 +966,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
-msgstr ""
+msgstr "Informații despre element"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
@@ -970,5 +981,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr ""
@@ -999,14 +1010,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Anulez..."
-
-#: ../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
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 #, java-format
 msgid ""
@@ -1014,5 +1024,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1060,10 +1070,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
-msgstr ""
+msgstr "stânga"
 
 #. dir == Direction.RIGHT) {
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
-msgstr ""
+msgstr "la dreapta"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
@@ -1087,5 +1097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
-msgstr ""
+msgstr "Arhivă nouă"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1096,5 +1106,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
-msgstr ""
+msgstr "Deschide..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
@@ -1118,5 +1128,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
-msgstr ""
+msgstr "Deschide un URL..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
@@ -1153,7 +1163,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Descarc date"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1291,5 +1300,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
-msgstr ""
+msgstr "Selectează te rog cel puțin o cale."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
@@ -1300,10 +1309,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 "Salvează"
 
 #: ../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 "Salvează datele curente."
@@ -1324,5 +1333,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 msgid "Save anyway"
-msgstr ""
+msgstr "Salvează oricum"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
@@ -1348,22 +1357,22 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Save OSM file"
-msgstr ""
+msgstr "Salvează fișier OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Save GPX file"
-msgstr ""
+msgstr "Salvează fișier GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
 msgid "Save Layer"
-msgstr ""
+msgstr "Salvează Strat"
 
 #: ../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:273
+msgid "Save As..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
-msgid "Save As..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Salvează datele curente într-un fişier nou."
@@ -1403,25 +1412,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -1429,5 +1438,5 @@
 msgstr[1] ""
 
-#: ../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 "
@@ -1439,9 +1448,9 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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."
@@ -1449,10 +1458,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -1460,5 +1469,5 @@
 msgstr ""
 
-#: ../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 "
@@ -1466,5 +1475,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 "
@@ -1472,5 +1481,5 @@
 msgstr ""
 
-#: ../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"
@@ -1500,47 +1509,47 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+msgid "The current selection cannot be used for unglueing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+msgid "Select either:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+msgid "* One tagged node, or"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "* One node that is used by more than one way, or"
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "The current selection cannot be used for unglueing."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "Select either:"
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+
+#: ../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."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One tagged node, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid "* One node that is used by more than one way, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1550,9 +1559,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1560,5 +1569,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"
@@ -1596,5 +1605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
-msgstr ""
+msgstr "Actualizează datele"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
@@ -1605,5 +1614,5 @@
 #.
 #: ../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 ""
@@ -1619,6 +1628,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Înlocuieşte selecţia"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1632,10 +1642,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 "Șterge obiectele selectate."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Actualizează datele"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1780,7 +1796,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Schimb {0} obiect"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1900,11 +1916,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+msgstr "Descarcă date GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Descarc date"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1912,5 +1928,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 ""
@@ -1926,7 +1942,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Numele utilizatorului."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1970,7 +1985,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Eroare la prelucrare."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1980,9 +1994,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete nodes or ways."
-msgstr ""
+msgstr "Șterge noduri sau căi"
 
 #: ../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
@@ -2013,6 +2027,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 "selectat"
@@ -2030,26 +2044,26 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:551
+msgstr "Adaugă nod nou la o cale existentă"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:550
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+msgstr "Creează nod nou"
+
+#: ../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 ""
 
-#: ../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."
@@ -2058,46 +2072,42 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../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 ""
-
-#: ../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:422
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr ""
 
@@ -2152,7 +2162,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
@@ -2179,67 +2197,69 @@
 msgstr ""
 
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+msgstr "Caută..."
+
+#: ../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 "Caută obiecte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Vă rog introduceţi un şir de căutat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+msgid "Enter the search expression"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "Înlocuieşte selecţia"
 
-#: ../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 "adaugă la selecţie"
 
-#: ../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 "elimină din selecţie"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2247,34 +2267,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2282,43 +2302,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2328,51 +2348,51 @@
 msgstr ""
 
-#: ../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 "Căutare"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2538,6 +2558,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
@@ -2663,5 +2683,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 ""
@@ -2687,4 +2707,7 @@
 
 #: ../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"
@@ -2709,6 +2732,7 @@
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Șterge {0} cale"
+msgstr[1] "Șterge {0} căi"
+msgstr[2] "Șterge {0} căi"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185
@@ -2720,5 +2744,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 ""
@@ -2726,6 +2750,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."
@@ -2734,5 +2758,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2743,5 +2767,15 @@
 msgstr ""
 
-#: ../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"
@@ -2823,5 +2857,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"
@@ -2926,7 +2960,13 @@
 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
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
 msgstr ""
 
@@ -3107,5 +3147,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
@@ -3119,5 +3159,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 ""
@@ -3125,4 +3165,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3180,32 +3256,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr ""
-
-#: ../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 ""
 
@@ -3230,45 +3307,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected, got {1}"
+msgstr ""
+
+#: ../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
@@ -3279,6 +3339,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 ""
 
@@ -3289,145 +3350,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr ""
 
-#: ../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
@@ -3438,5 +3499,5 @@
 msgstr[2] "de noduri"
 
-#: ../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
@@ -3447,6 +3508,6 @@
 msgstr[2] "de căi"
 
-#: ../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
@@ -3456,13 +3517,13 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 "cale incompletă"
 
-#: ../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
@@ -3470,5 +3531,5 @@
 msgstr "fundal"
 
-#: ../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 ""
@@ -3547,5 +3608,5 @@
 msgstr ""
 
-#: ../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
@@ -3553,32 +3614,32 @@
 msgstr ""
 
-#: ../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 "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr ""
 
-#: ../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"
@@ -3587,5 +3648,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3594,33 +3655,33 @@
 msgstr[1] ""
 
-#: ../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
@@ -3628,9 +3689,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 "Gazdă necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3844,5 +3905,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 "Editare"
@@ -3882,5 +3943,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:268
 msgid "Full Screen"
-msgstr ""
+msgstr "Ecran complet"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:270
@@ -3968,10 +4029,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 "stratul nu este în listă."
 
-#: ../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"
@@ -4100,5 +4161,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"
@@ -4107,5 +4168,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"
@@ -4115,5 +4176,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 ""
@@ -4542,5 +4603,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 ""
@@ -4598,6 +4659,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 ""
@@ -4726,4 +4785,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"
@@ -4820,5 +4880,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"
@@ -4829,5 +4889,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"
@@ -4868,7 +4928,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Introdu valori pentru toate conflictele."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4954,5 +5013,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
@@ -5050,5 +5109,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"
@@ -5104,11 +5163,11 @@
 msgstr "Afişează istoricul tuturor elementelor selectate."
 
-#: ../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
@@ -5116,13 +5175,13 @@
 msgstr "Reîncarcă"
 
-#: ../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 "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
 
-#: ../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 ""
@@ -5179,13 +5238,13 @@
 
 #: ../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] ""
-msgstr[1] ""
+msgstr[0] "Schimb {0} obiect"
+msgstr[1] "Schimb {0} obiecte"
+msgstr[2] "Schimb {0} de obiecte"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "An empty value deletes the key."
+msgid "An empty value deletes the tag."
 msgstr ""
 
@@ -5210,4 +5269,11 @@
 msgstr[1] ""
 
+#: ../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] ""
+msgstr[1] ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5285,56 +5351,54 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Afişează istoricul tuturor elementelor selectate."
-
-#: ../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 "Selectaţi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
 msgstr ""
@@ -5491,5 +5555,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}"
@@ -5728,18 +5792,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 ""
@@ -5762,5 +5826,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}"
@@ -5856,7 +5920,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 "Vă rog introduceţi un nume pentru locaţie."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5958,7 +6021,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Şterge stratul selectat."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5979,7 +6041,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Vă rog selectaţi rândul care va fi editat."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6008,7 +6069,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Căutare"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6942,7 +7002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "Căutare"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -6987,5 +7046,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 ""
@@ -6999,5 +7058,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 ""
@@ -7008,5 +7067,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 ""
@@ -7015,19 +7074,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 ""
@@ -7037,32 +7096,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 ""
@@ -7084,37 +7143,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 ""
@@ -7122,5 +7181,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 ""
@@ -7128,9 +7187,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 ""
@@ -7139,24 +7198,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
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr ""
+
+#: ../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}"
@@ -7169,4 +7238,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Apropie la {0}"
+
+#: ../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 "Istoric"
+
+#: ../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
@@ -7179,16 +7266,64 @@
 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
+msgid "not present"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "necunoscut"
+
+#: ../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
+msgid "anonymous"
 msgstr ""
 
@@ -7214,4 +7349,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 "Versiune {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "şters"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7556,10 +7706,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] "Obiecte de modificat:"
-msgstr[1] "Obiecte de modificat:"
-msgstr[2] "Obiecte de modificat:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7639,13 +7788,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
@@ -7712,5 +7861,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}..."
@@ -7722,5 +7871,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 "Imagini geoetichetate"
@@ -7746,5 +7895,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"
@@ -7800,43 +7949,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 "punct gps"
 
 #: ../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 "Personalizează trasarea liniilor"
 
 #: ../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 "Utilizează opţiunile globale."
 
 #: ../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 "Trasează linii între puncte pentru acest strat."
 
 #: ../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 "Nu trasa linii între puncte pentru acest strat."
 
 #: ../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 "Selectaţi opţiunile pentru trasarea liniilor"
 
 #: ../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 "Personalizează culoarea"
 
 #: ../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"
@@ -7844,6 +7993,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"
@@ -7933,10 +8082,10 @@
 msgstr[1] ""
 
-#: ../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 "Converteşte la strat de date"
 
-#: ../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."
@@ -7944,43 +8093,43 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -7989,9 +8138,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -7999,5 +8148,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8041,5 +8190,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8053,5 +8201,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
@@ -8059,34 +8206,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} şters.)"
-msgstr[1] " ({0} şters.)"
-msgstr[2] " ({0} şters.)"
-
-#: ../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} constă în:"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -8094,5 +8240,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"
@@ -8101,5 +8247,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"
@@ -8108,5 +8254,5 @@
 msgstr[2] "de puncte"
 
-#: ../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"
@@ -8116,5 +8262,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: ../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"
@@ -8124,5 +8270,5 @@
 msgstr[2] "{0} este format din {1} de urme"
 
-#: ../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"
@@ -8132,9 +8278,9 @@
 msgstr[2] "{0} de puncte"
 
-#: ../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 ""
 
-#: ../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"
@@ -8142,5 +8288,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8149,14 +8295,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -8164,14 +8310,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8179,13 +8325,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -8249,5 +8395,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 "Vă rog selectaţi rândul care va fi editat."
@@ -8261,5 +8407,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."
@@ -8696,5 +8842,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
-msgstr ""
+msgstr "Date OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
@@ -8974,12 +9120,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Şterge sursele selectate din listă."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Editează valoarea cheii selectata pentru toate obiectele"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -8997,12 +9141,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Reîncarcă lista de selecţii"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Şterge cheia selectată din toate obiectele"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9615,5 +9757,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}''."
@@ -9640,5 +9782,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}."
@@ -9646,5 +9788,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}"
@@ -9657,5 +9799,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}''."
@@ -9808,5 +9950,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9815,38 +9957,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 ""
@@ -9854,19 +9996,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 ""
 
-#: ../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 "Obiect ilegal cu 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 ""
@@ -9877,9 +10019,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 ""
@@ -9889,25 +10031,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 ""
@@ -9915,5 +10057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9922,5 +10064,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9928,5 +10070,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9935,13 +10077,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 ""
 
-#: ../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 ""
@@ -10093,5 +10235,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10283,35 +10424,4 @@
 "{0}"
 msgstr ""
-
-#. 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 "necunoscut"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10917,47 +11027,46 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Mută stratul selectat un rând în sus."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -10973,24 +11082,24 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Eroare la prelucrarea {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 "Nu am putut citi \"{0}\""
 
-#: ../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."
@@ -10999,34 +11108,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11034,69 +11143,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11105,9 +11214,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11116,65 +11225,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11182,13 +11291,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11209,5 +11318,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11220,37 +11329,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11262,18 +11371,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11300,34 +11409,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11339,18 +11448,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11358,5 +11467,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11364,74 +11473,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11439,30 +11548,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11470,29 +11579,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11501,13 +11610,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"
@@ -11515,5 +11624,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"
@@ -11521,14 +11630,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"
@@ -11536,14 +11645,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"
@@ -11551,64 +11660,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11616,25 +11725,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11644,14 +11753,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11659,5 +11768,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
@@ -11665,5 +11774,5 @@
 msgstr ""
 
-#: ../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"
@@ -11671,34 +11780,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11707,18 +11816,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11825,9 +11934,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11844,11 +11953,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 ""
 
 #: ../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 ""
@@ -11858,5 +11967,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 ""
@@ -12066,5 +12175,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12486,5 +12595,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12563,5 +12672,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12694,7 +12803,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Strat"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12858,42 +12966,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 ""
 
-#: ../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 "Apropie"
-
-#: ../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 ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13273,6 +13380,6 @@
 msgstr ""
 
-#: ../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
@@ -13280,5 +13387,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13365,5 +13472,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13492,18 +13599,18 @@
 msgstr ""
 
+#: ../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 ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../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 ""
@@ -13655,80 +13762,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13736,86 +13843,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Şterge sursele selectate din listă."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -13990,17 +14097,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14051,13 +14158,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14101,61 +14208,63 @@
 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 "descărcare"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Descarcă hărţi de la serverul OSM."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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
+msgid "Merge duplicate node?"
+msgstr ""
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr ""
-
-#: ../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 ""
 
@@ -14163,5 +14272,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 msgid "Rectified Image..."
-msgstr ""
+msgstr "Image Rectificată..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
@@ -14197,5 +14306,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Add Rectified Image"
-msgstr ""
+msgstr "Adaugă Imagine Rectificată"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
@@ -14258,28 +14367,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14290,55 +14399,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
+msgstr "Salvează strat WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -26734,16 +26843,4 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Fişierul nu a putut fi găsit."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Eroare la prelucrare"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Vă rog întâi introduceţi coordonatele dorite."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selectaţi întâi un semn de carte."
-
 #~ msgid "Unknown version"
 #~ msgstr "Versiune necunoscută"
@@ -26777,4 +26874,7 @@
 #~ msgstr "Au existat conflicte în timpul importului."
 
+#~ msgid "Error while parsing"
+#~ msgstr "Eroare la prelucrare"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Nume autentificare (email) pentru contul OSM."
@@ -26811,4 +26911,13 @@
 #~ msgid "No data imported."
 #~ msgstr "Nu au fost importate date."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Vă rog întâi introduceţi coordonatele dorite."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selectaţi întâi un semn de carte."
+
+#~ msgid "File could not be found."
+#~ msgstr "Fişierul nu a putut fi găsit."
 
 #~ msgid "No document open so nothing to save."
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 18508)
+++ applications/editors/josm/i18n/po/ru.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-26 21:02+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-13 20:06+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -50,18 +50,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
@@ -71,6 +71,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
@@ -78,11 +77,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
@@ -97,4 +96,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"
@@ -121,6 +121,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
@@ -136,7 +136,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
@@ -147,7 +147,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
@@ -173,12 +173,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
@@ -190,6 +190,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 "Ошибка"
@@ -210,6 +211,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"
@@ -322,5 +323,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
@@ -338,6 +339,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
@@ -348,5 +349,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
@@ -469,5 +470,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
@@ -509,5 +510,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
@@ -516,6 +517,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"
@@ -564,10 +566,10 @@
 #, java-format
 msgid "Zoom to {0}"
-msgstr "Показать {0}"
+msgstr "Масштабировать до {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Изменить масштаб чтобы показать {0}."
+msgstr "Приблизить вид до {0}."
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
@@ -581,9 +583,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
-msgstr "Ничего не выделено для показа."
+msgstr "Ничего не выделено для масштабирования."
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
-msgstr "Нет конфликтов чтобы их показать."
+msgstr "Нет конфликтов чтобы их приблизить"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
@@ -639,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
-msgstr "Перевернуть и объеденить"
+msgstr "Сменить направление и объединить"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
@@ -703,5 +705,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
@@ -714,5 +716,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"
@@ -784,5 +786,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
@@ -790,28 +800,28 @@
 msgstr "Параметр ''{0}'' не должен быть пустым"
 
-#: ../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 "За время импорта произошло {0} конфликт(ов)"
 
-#: ../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 "({0}/{1}) Загрузка родителей точки {2}"
 
-#: ../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 "({0}/{1}) Загрузка родителей линии {2}"
 
-#: ../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}"
@@ -848,10 +858,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 "Экспорт в 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 "Экспортировать данные в GPX файл"
@@ -864,11 +874,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
@@ -899,5 +908,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
@@ -912,17 +920,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
@@ -982,5 +991,5 @@
 msgstr "Включить точку в состав ближайшей линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Включить точку в линию"
@@ -1011,22 +1020,21 @@
 msgstr "Пожалуйста, выберите как минимум две точки для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Прерывание..."
-
-#: ../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
+msgstr "Нажмите, чтобы прервать процесс объединения точек"
+
+#: ../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 ""
-"Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
+"Невозможно объединить точки: Придется удалить линию ''{0}'' которая ещё "
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1036,5 +1044,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
-msgstr "Соединить выделение"
+msgstr "Объединить выделенное"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
@@ -1167,5 +1175,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
 msgstr "Скачать данные"
@@ -1247,9 +1254,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
-msgstr "Вставить метки"
+msgstr "Вставить теги"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Применить метки из буфера ко всем выделенным объектам."
+msgstr "Применить теги из буфера ко всем выделенным объектам."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
@@ -1257,7 +1264,7 @@
 msgid "Pasting {0} tag"
 msgid_plural "Pasting {0} tags"
-msgstr[0] "Вставляется {0} метка"
-msgstr[1] "Вставляется {0} метки"
-msgstr[2] "Вставляется {0} меток"
+msgstr[0] "Вставляется {0} тег"
+msgstr[1] "Вставляется {0} тега"
+msgstr[2] "Вставляется {0} тегов"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
@@ -1325,10 +1332,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 "Сохранить"
 
 #: ../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 "Сохранить текущие данные."
@@ -1385,10 +1392,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 "Сохранить как..."
 
 #: ../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 "Сохранить текущие данные в новый файл."
@@ -1432,25 +1439,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 "Закрыть"
 
-#: ../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 "Разделить линию"
 
-#: ../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 "Разделить линию в выделенной точке."
 
-#: ../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 "Текущее выделение невозможно разделить."
 
-#: ../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."
@@ -1459,5 +1466,5 @@
 msgstr[2] "Выбранные точки не находится в середине какой-либо линии."
 
-#: ../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 "
@@ -1476,9 +1483,9 @@
 "выберите также линию."
 
-#: ../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 "Выделенные точки не являются частью одной линии."
 
-#: ../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."
@@ -1487,10 +1494,10 @@
 msgstr[2] "Выделенная линия не содержит все выбранные точки"
 
-#: ../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 "Чтобы разделить замкнутую линию, выделите не менее двух точек."
 
-#: ../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 "
@@ -1500,5 +1507,5 @@
 "линии)."
 
-#: ../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 "
@@ -1509,5 +1516,5 @@
 "html>"
 
-#: ../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 "
@@ -1517,5 +1524,5 @@
 "необходимо проверить и исправить, если потребуется.</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"
@@ -1545,44 +1552,44 @@
 msgstr "Дублировать точки, используемые несколькими линиями."
 
-#: ../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 "Данная точка ни к чему не прикреплена."
 
-#: ../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 "Ни одна из этих точек ни к чему не прикреплена."
 
-#: ../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 ""
 "Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена."
 
-#: ../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 "Выделенные объекты невозможно разъединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Выберите один из вариантов:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
-msgstr "* Одна точка с метками, либо"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgstr "* Одна точка с тегами, либо"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Одна точка, используемая несколькими линиями, либо"
 
-#: ../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 ""
 "* Одна точка, используемая несколькими линиями и одной из этих линий, либо"
 
-#: ../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"
 msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо"
 
-#: ../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."
@@ -1591,5 +1598,5 @@
 "несколькими линиями."
 
-#: ../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"
@@ -1602,9 +1609,9 @@
 "и все точки будут выделены."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Неприкрепленная точка"
 
-#: ../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"
@@ -1612,5 +1619,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"
@@ -1651,12 +1658,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Обновляет объекты с сервера, в текущем слое данных ."
+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 "Скачать данные"
@@ -1672,5 +1678,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Обновить выделенное"
 
@@ -1687,5 +1694,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Не выделены элементы для обновления."
 
@@ -1693,4 +1701,9 @@
 msgid "Selection empty"
 msgstr "Выборка пуста"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Удалить объекты"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1700,7 +1713,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 "Загрузить на сервер OSM все изменения в текущем слое данных"
+msgstr "Передать все изменения в активном слое на сервер OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1850,30 +1862,30 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на "
-"сервер будет произведена без этого элемента."
+"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы "
+"снова на сервер, но без этого объекта."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
-"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на "
-"сервер будет произведена без этого элемента."
+"Объект ''{0}'' уже удалён. Объект будет пропущен при передаче данных на "
+"сервер."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Загрузка данных на сервер ..."
+msgstr "Передача объектов на сервер. Кол-во: {0}..."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Игнорирование исключения, так как скачивание было отменено. Исключение было: "
-"{0}"
+"Игнорирование выявленного исключения, так как загрузка на сервер отменена. "
+"Исключение: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1990,9 +2002,9 @@
 msgstr "Скачанные GPX данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Скачивание данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -2002,5 +2014,5 @@
 "{0}"
 
-#: ../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 "В этом месте нет данных."
@@ -2016,16 +2028,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "видим (на сервере)"
+msgstr "Проверить на сервере"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} объект был очищен в локальном наборе данных, потому что он удалён на "
-"сервере."
+"Нажмите, чтобы проверить, не удалены ли на сервере объекты, находящиеся в "
+"вашей базе данных"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2035,7 +2045,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Щёлкните, чтобы отменить и подтвердить правку карты"
+msgstr "Нажмите, чтобы прервать процесс и продолжить правку"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2059,8 +2068,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr ""
-"Во время скачивания большого массива данных обнаружены следующие ошибки:{0}"
+msgstr "Во время гигантского скачивания произошли следующие ошибки: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2070,7 +2078,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Ошибка во время скачивания"
+msgstr "Ошибки при скачивании с сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2086,5 +2093,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
@@ -2118,6 +2125,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 "выделено"
@@ -2135,26 +2142,26 @@
 msgstr "Вставить точку в линию"
 
-#: ../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 "Присоединить линию к точке"
 
-#: ../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 "Добавить новую точку к линии"
 
-#: ../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 "Добавить точку к линии и объединить"
 
-#: ../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 "Создать новую точку"
 
-#: ../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 "Выделить точку под курсором."
 
-#: ../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."
@@ -2164,46 +2171,45 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../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 "Начать новую линию с последней точки"
 
-#: ../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 "Продолжить линию с последней точки"
 
-#: ../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 "Закончено вычерчивание"
 
-#: ../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 "Выдавливание"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
-msgstr "Создание областей"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+msgstr ""
+"Создание прямоугольников из отрезка и \"выдавливание\" линий из полигонов"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Выдавить линию"
 
-#: ../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 "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
 
-#: ../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 "Отпустите кнопку мыши, чтобы прекратить вращение."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
 
@@ -2265,4 +2271,8 @@
 msgstr "Всегда перемещать и больше не показывать этого предупреждения"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2271,4 +2281,8 @@
 "Отпустите кнопку мыши, чтобы прекратить перемещение. Нажмите Ctrl для "
 "объединения с ближайшей точкой."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2299,67 +2313,70 @@
 "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
 
-#: ../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 "Поиск..."
 
-#: ../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 "Поиск объектов."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Поиск невозможен, так как не загружено никаких данных."
-
-#: ../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 "Пожалуйста, введите строку для поиска."
 
-#: ../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 "регулярное выражение"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "заменить выделение"
 
-#: ../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 "добавить к выделению"
 
-#: ../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 "убрать из выделения"
 
-#: ../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 "регистрозависимый"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "регулярное выражение"
 
-#: ../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>Baker Street</b> - 'Baker' и 'Street' в любом ключе или названии."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
 
-#: ../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:Bak</b> - 'Bak' в любом месте названия."
 
-#: ../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> - ключ 'type' с точным значением '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>, "
@@ -2369,17 +2386,17 @@
 "b>, <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:Bak</b> - название не содержит 'Bak'."
 
-#: ../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> - key=foot устанавливает в любых значениях."
 
-#: ../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>Специальные цели:</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>)"
@@ -2388,47 +2405,48 @@
 "(линия), <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>user:</b>... - все объекты, измененные заданным пользователем"
 
-#: ../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 "<b>id:</b>... - объект с данным ID (0 для новых объектов)"
 
-#: ../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>точки:</b>... - объект с заданным количеством точек"
 
-#: ../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>точки:</b>... - объект с заданным количеством точек"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgstr ""
+"<b>tags:</b>... - объект с заданным количеством тегов (tags:кол-во или tags:"
+"мин-макс)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все измененные объекты"
 
-#: ../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> - все выделенные объекты"
 
-#: ../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> - все незаконченные объекты"
 
-#: ../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>untagged</b> - все объекты без меток"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+msgstr "<b>untagged</b> - все объекты без тегов"
+
+#: ../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 ""
-"<b>child <i>выражение</i></b> - все наследники объектов, соответствующие "
+"<b>child <i>выражение</i></b> - все дочерние элементы, соответствующие "
 "выражению"
 
-#: ../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"
@@ -2437,5 +2455,5 @@
 "выражению"
 
-#: ../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 ""
@@ -2443,5 +2461,5 @@
 "«или»"
 
-#: ../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 ""
@@ -2449,9 +2467,9 @@
 "ключ содержит двоеточие)"
 
-#: ../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 "Используйте <b>(</b> and <b>)</b> для группировки выражений"
 
-#: ../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
@@ -2461,51 +2479,51 @@
 msgstr "Фильтр"
 
-#: ../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 "Поиск"
 
-#: ../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 "Начать поиск"
 
-#: ../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 "Не найдено совпадений для ''{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 "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
-#: ../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 "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../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 "Ничего не найдено в выделенном, при поиске ''{0}''"
 
-#: ../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} совпадений"
 
-#: ../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"
@@ -2525,5 +2543,5 @@
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
-"Ключ не может быть пустым при использовании метки оператора. Пример "
+"Ключ не может быть пустым при использовании тега оператора. Пример "
 "использования: ключ=значение"
 
@@ -2558,16 +2576,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Неверное число параметров для оператора точек."
+msgstr "Неверное количество параметров оператора tags."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Неверное значение оператора точек: {0}. Оператор точек ожидает число точек "
-"или диапазон, например, точки:10-20"
+"Неверное значение оператора tags: {0}. Оператор tags обнаружил число, "
+"выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2638,5 +2655,5 @@
 "{1}"
 msgstr ""
-"Предупреждение: автоматическое усечение значения метки ''{0}'' на удалённом "
+"Предупреждение: автоматическое усечение значения тега ''{0}'' на удалённом "
 "элементе {1}"
 
@@ -2647,5 +2664,5 @@
 "length {2}. Values length is {3}."
 msgstr ""
-"Длина значения для метки \"{0}'' элемента {1} превышает максимально "
+"Длина значения для тега \"{0}'' элемента {1} превышает максимально "
 "допустимую длину {2}. Значение длины {3}."
 
@@ -2694,6 +2711,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
@@ -2823,5 +2840,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 ""
@@ -2842,12 +2859,16 @@
 #: ../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 "параметр ''{0}'' не должен быть пустым"
+msgstr "Параметр ''{0}'' не должен быть пустым"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#, fuzzy
+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"
-msgstr ""
+msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
@@ -2884,5 +2905,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 "Разделить сегмент линии"
@@ -2890,6 +2911,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."
@@ -2901,5 +2922,5 @@
 "могут использовать их.<br> Вы действительно хотите удалить эти точки?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Удалить подтверждение"
@@ -2910,5 +2931,15 @@
 msgstr "Устранить конфликт при удалении {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"
@@ -2982,17 +3013,17 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Устранить {0} конфликтов меток в точке {1}"
+msgstr "Устранить {0} конфликтов тегов в точке {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "Устранить {0} конфликтов меток в линии {1}"
+msgstr "Устранить {0} конфликтов тегов в линии {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Устранить {0} конфликтов меток в отношении {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+msgstr "Устранить {0} конфликтов тегов в отношении {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3087,20 +3118,26 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
 msgid "Automatic tag correction"
-msgstr "Автоматически исправлять метки"
+msgstr "Автоматически исправлять теги"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
 #, java-format
 msgid "Expected array of length 4, got {0}"
-msgstr ""
+msgstr "Ожидаемая длина массива 4, получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
 #, java-format
 msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+msgstr "Только четыре дубля ожидалось в строке, получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Неверное значение дубля ''{0}''"
+
+#: ../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 "Текущее значение - ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3197,5 +3234,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3204,4 +3241,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в файле закладок "
+"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -3222,5 +3261,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
+msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
@@ -3230,4 +3269,6 @@
 "server"
 msgstr ""
+"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в списке закладок "
+"с сервера"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
@@ -3241,9 +3282,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Не удалось загрузить закладки с ''{0}'' в свези с проблемами безопасности. "
-"Текст ошибки: {1}"
+msgstr "Не удалось загрузить ресурс ''{0}''. Ошибка: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3257,8 +3296,10 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Предупреждение: неожиданный номер версии JOSM в файле исправлений, значение: "
+"''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Предупреждение: отсутствует файл исправлений ''/REVISION''."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
@@ -3302,5 +3343,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
@@ -3313,6 +3354,7 @@
 "Unable to add primitive {0} to the dataset because it's already included"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+"Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3321,4 +3363,46 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM ожидал найти примитив [{0} {1}] в наборе данных, но его там нет. "
+"Пожалуйста, сообщите об этом на http://josm.openstreetmap.de . Это не "
+"критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу."
+
+#: ../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 "Отсутствуют параметры для \"НЕ\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "История для отношения {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
+"низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. "
+"Сохраняю мой элемент. "
 
 #. translators notes must be in front
@@ -3375,33 +3459,34 @@
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Ошибка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Предупреждение: {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 "обнаружен id >= 0. Получено {0}"
 
-#: ../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 "Элемент с id=0 не может быть невидимым"
 
-#: ../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 "обнаружено id > 0. Получено {0}"
 
-#: ../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 "обнаружена версия > 0. Получено {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3424,48 +3509,31 @@
 "multiple values."
 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 "невозможно добавить узел {0} к незавершённой линии {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "В этой истории не существует элемента версии {0}"
-
-#: ../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 "Нет версии действительной для даты \"{0}\" в этой истории"
-
-#: ../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 "требуется параметр ''{0}'' > 0. Получен {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
 
-#: ../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 "Элемент с id {0} не был найден в этом наборе данных"
-
-#: ../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 "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
-
-#: ../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
@@ -3476,6 +3544,7 @@
 msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "Невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''"
 
@@ -3486,72 +3555,72 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../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 "Линия, обозначающая границу области, не замкнута."
 
-#: ../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 "область с вложениями ''{0}'' не замкнута"
 
-#: ../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 "В отношении «{0}» имеется участник, который был удален."
 
-#: ../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 "Линия «{0}» имеет меньше двух точек."
 
-#: ../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 "Обнаружена больше чем одна линия \"от\""
 
-#: ../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 "Обнаружено больше одной линии \"до\""
 
-#: ../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 "Найдено больше одного \"via\" (через)."
 
-#: ../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 "Неизвестная роль «{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 "Неизвестный тип участника для «{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 "Не найдена линия \"от\""
 
-#: ../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 "Не найдена линия \"до\""
 
-#: ../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 "Не найдена точка или линия \"via\" (через)."
 
-#: ../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 ""
 "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)."
 
-#: ../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 ""
 "Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)."
 
-#: ../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 ""
@@ -3559,40 +3628,40 @@
 "\" (через)."
 
-#: ../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 ""
 "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)."
 
-#: ../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 "Стиль для ограничения {0} не найден."
 
-#: ../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 "Персечение между линиями ''{0}'' и ''{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 "Внутренняя линия «{0}» находится снаружи."
 
-#: ../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 "Нет полезной роли ''{0}'' для пути ''{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 "не-линия ''{0}'' области с вложениями"
 
-#: ../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 "Для области с вложениями «{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."
@@ -3600,40 +3669,37 @@
 "Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями."
 
-#: ../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 "Стиль для внешней линии ''{0}'' отсутствует."
 
-#: ../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 "без метки"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1422
+msgstr "без тегов"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1390
 msgid "text"
 msgstr "текст"
 
-#: ../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 ""
-"Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
-"низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. "
-"Сохраняю мой элемент. "
-
-#: ../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 "Ошибка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Предупреждение: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "неактивный"
 
-#: ../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
@@ -3644,5 +3710,5 @@
 msgstr[2] "точек"
 
-#: ../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
@@ -3653,6 +3719,6 @@
 msgstr[2] "линий"
 
-#: ../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
@@ -3663,13 +3729,13 @@
 msgstr[2] "отношений"
 
-#: ../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 "линия без меток"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+msgstr "линия без тегов"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 msgid "incomplete way"
 msgstr "незаконченная линия"
 
-#: ../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
@@ -3677,5 +3743,5 @@
 msgstr "фон"
 
-#: ../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 "подсветка"
@@ -3760,5 +3826,5 @@
 msgstr "Больше не показывать"
 
-#: ../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
@@ -3766,32 +3832,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 "неполный"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "дорога"
 
-#: ../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 "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "водоём"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../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"
@@ -3801,5 +3867,5 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3809,33 +3875,33 @@
 msgstr[2] "{0} участников"
 
-#: ../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
@@ -3843,9 +3909,9 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Неизвестный хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Объект удалён"
@@ -3867,7 +3933,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Закрыть диалог"
+msgstr "Нажмите, чтобы закрыть диалог"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4070,5 +4135,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 "Правка"
@@ -4185,6 +4250,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
-"Middle click again to cycle through.<br>Hold CTRL to select directly from "
-"this list with the mouse.<hr>"
+"Нажмите на среднюю клавишу ещё раз, чтобы переключиться на следующий элемент."
+"<br>Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
@@ -4196,10 +4261,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 "слоя нет в списке."
 
-#: ../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"
@@ -4207,7 +4272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Нет, отменить действие"
+msgstr "Нажмите, чтобы отменить текущую операцию"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4336,12 +4400,12 @@
 #: ../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"
-msgstr "Метки"
+msgstr "Теги"
 
 #: ../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"
@@ -4351,5 +4415,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 "Участники"
@@ -4357,15 +4421,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
-msgstr "Нет конфликтов меток"
+msgstr "Нет конфликтов тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr "Метки({0} конфликтов)"
+msgstr "Теги ({0} конфликтов)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr "{0} неустранённых конфликтов меток"
+msgstr "{0} неустранённых конфликтов тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
@@ -4501,5 +4565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr "Скопировать выделенные элементы в конец объединённого списка элементов"
+msgstr "Скопировать выделенные элементы в конец списка объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
@@ -4508,6 +4572,6 @@
 "merged elements."
 msgstr ""
-"Скопировать выделенные элементы перед первым выделенным элементом в "
-"объединённом списке элементов"
+"Скопировать выделенные элементы перед первым выделенным элементом в списке "
+"объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
@@ -4517,5 +4581,5 @@
 msgstr ""
 "Скопировать мои выделенные элементы после первого выделенного элемента в "
-"объединённом списке элементов"
+"списке объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
@@ -4523,10 +4587,10 @@
 "Copy their selected element to the start of the list of merged elements."
 msgstr ""
-"Скопировать их выделенные элементы в начало объединённого списка элементов"
+"Скопировать их выделенные элементы в начало списка объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
-"Скопировать их выделенные элементы в конец объединённого списка элементов"
+"Скопировать их выделенные элементы в конец списка объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
@@ -4536,5 +4600,5 @@
 msgstr ""
 "Скопировать их выделенные элементы перед первым выделенным элементом в "
-"объединённом списке элементов"
+"списке объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
@@ -4544,5 +4608,5 @@
 msgstr ""
 "Скопировать их выделенные элементы после первого выделенного элемента в "
-"объединённом списке элементов"
+"списке объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
@@ -4575,24 +4639,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements."
-msgstr "Удалить выделенные записи из объединённого списка элементов"
+msgstr "Удалить выделенные записи из списка объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
-msgstr "Зафиксировать"
+msgstr "Заблокировать"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements."
-msgstr "Зафиксировать текущий объединённый список элементов"
+msgstr "Заблокировать текущий список объединённых элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
-msgstr "Отменить фиксирование"
+msgstr "Разблокировать"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging."
-msgstr ""
-"Отменить фиксирование объединённого списка элементов и начать объединение"
+msgstr "Разблокировать список объединённых элементов и начать объединение"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
@@ -4602,6 +4665,6 @@
 "html>"
 msgstr ""
-"<html>Нажмите <strong>{0}</strong> что бы начать объединение моих и их "
-"записи</html>"
+"<html>Нажмите <strong>{0}</strong>, чтобы начать объединение моих и их "
+"записей</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
@@ -4611,5 +4674,5 @@
 "html>"
 msgstr ""
-"<html>Нажмите <strong>{0}</strong> что бы закончить объединение моих и их "
+"<html>Нажмите <strong>{0}</strong>, чтобы закончить объединение моих и их "
 "записей</html>"
 
@@ -4661,6 +4724,6 @@
 msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
-"Объединённые узля ещё не заморожены. Невозможно построить команду устранения "
-"конфликтов."
+"Объединённые точки ещё не заблокированы. Невозможно построить команду "
+"устранения конфликтов."
 
 #. should not happen
@@ -4731,6 +4794,6 @@
 "elements when merge decisions are applied."
 msgstr ""
-"Параметры в объединённом элементе. Параметры в моём элементе будут заменены "
-"при объединении."
+"Параметры в объединённом элементе. Параметры в моих элементах будут заменены "
+"при применении объединения."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
@@ -4817,5 +4880,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 "Нет, прервать"
@@ -4869,5 +4932,5 @@
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
-"Объединённые точки ещё не заморожены. Невозможно построить команду "
+"Объединённые точки ещё не заблокированы. Невозможно построить команду "
 "устранения конфликтов"
 
@@ -4880,6 +4943,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 "<не определено>"
@@ -4891,5 +4952,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr "Объединённый набор данных не будет содержать метку с ключом {0}"
+msgstr "Объединённый набор данных не будет содержать тег с ключом {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
@@ -4897,5 +4958,5 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr "Мой набор данных не содержит метку с ключом {0}"
+msgstr "Мой набор данных не содержит тег с ключом {0}"
 
 #. setting up the properties table
@@ -4929,5 +4990,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "Cannot apply undecided tag merge item."
-msgstr "Не могу принять неопределённое объединение меток"
+msgstr ""
+"Невозможно применить тег объединённого элемента из-за неустранённого "
+"конфликта"
 
 #. should not happen, but just in case
@@ -4964,5 +5027,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
-msgstr "Пометить выделенные метки, как неулаженные конфликты"
+msgstr "Пометить выделенные теги, как неулаженные конфликты"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
@@ -4970,5 +5033,5 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr "Их набор данных не содержит метку с ключом {0}"
+msgstr "Их набор данных не содержит тег с ключом {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
@@ -4982,7 +5045,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Конфликт при слиянии точек - объединённая точка ''{0}''"
+msgstr "Возникли конфликты при объединении точек - полученная точка ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -5008,4 +5071,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"
@@ -5049,9 +5113,9 @@
 msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
-"Ожидался параметр ''{0}'' с метками для определённого ключа. Получено {1}."
+"Ожидался параметр ''{0}'' с тегами для определённого ключа. Получено {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
 msgid "Tag collection doesn't include the selected value ''{0}''."
-msgstr "набор меток не содержит выделенное значение ''{0}''"
+msgstr "набор тегов не содержит выделенное значение ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5064,17 +5128,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr "Метки точек \"from\" (от)"
+msgstr "Теги точек \"from\" (от)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr "Метки ролей \"from way\""
+msgstr "Теги ролей \"from way\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr "Метки отношений"
+msgstr "Теги отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr "Конфликты в назначенных метках"
+msgstr "Конфликты в назначенных тегах"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374
@@ -5097,12 +5161,12 @@
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "{0} метка"
-msgstr[1] "{0} метки"
-msgstr[2] "{0} меток"
+msgstr[0] "{0} тег"
+msgstr[1] "{0} тега"
+msgstr[2] "{0} тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java: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"
@@ -5114,5 +5178,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"
@@ -5133,12 +5197,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Сохранить мои"
+msgstr "Сохранить"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Удалить этого участника из отношения"
+msgstr "Сохранить этого участника отношений для получаемого объекта"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5157,12 +5219,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Задать роль для выделенных участников"
+msgstr "Введите роль для всех участников отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Метка изменённых отношений с   "
+msgstr "Пометьте изменённые отношения тегом "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5171,4 +5231,6 @@
 "modified relations.</html>"
 msgstr ""
+"<html>Отметьте, какой тег будет назначен <br>на все изменённые отношения.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5178,7 +5240,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Загрузка на сервер <strong>не удалась</strong>.<br>{0}</html>"
+msgstr ""
+"<html>Введите ключ тега, например: <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5190,4 +5252,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Введите значение тега, например: <strong><tt>check members</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5199,4 +5263,9 @@
 "place of the original way in the membership.</html>"
 msgstr ""
+"<html>Комбинированные линии являются участниками одного или более отношений. "
+"Пожалуйста решите, хотите ли вы <strong>сохранить</strong> этих участников "
+"для комбинированной линии или вы хотите <strong>удалить</strong> их.<br>По "
+"умолчанию они будут <strong>сохранены</strong>: комбинированная линия будет "
+"на месте оригинальной линии отношения.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
@@ -5208,4 +5277,9 @@
 "original node in the membership.</html>"
 msgstr ""
+"<html>Объединённые точки являются членами одного или более отношений. "
+"Пожалуйста решите, хотите ли вы  <strong>сохранить</strong> этих участников "
+"для полученной точки или вы хотите <strong>удалить</strong> их.<br>По "
+"умолчанию, они будут <strong>сохранены</strong>: полученная точка будет на "
+"месте оригинальной точки отношения.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
@@ -5224,9 +5298,9 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Пожалуйста, выберите, какие значения сохранить для новых меток.</html>"
+"<html>Пожалуйста, выберите, какие значения сохранить для новых тегов.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
 msgid "Show tags with conflicts only"
-msgstr "Показать только метки с конфликтами"
+msgstr "Показать только теги с конфликтами"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5246,5 +5320,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
@@ -5274,5 +5348,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
 msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Открыть диалоговое окно для слияния выделенных объектов."
+msgstr ""
+"Открыть диалоговое окно для слияния выделенных в вышеуказанном списке "
+"объектов."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
@@ -5344,5 +5420,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"
@@ -5379,5 +5455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Apply also for children"
-msgstr "Применить также для наследников"
+msgstr "Применить также для дочерних элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
@@ -5398,11 +5474,11 @@
 msgstr "Отобразить журнал по всем выделенным объектам."
 
-#: ../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
@@ -5410,13 +5486,13 @@
 msgstr "Обновить"
 
-#: ../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 "Скачать заново все выделенные объекты, и обновить список."
 
-#: ../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 "Показать историю выделенных объектов."
@@ -5473,7 +5549,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] "Количество изменяемых объектов: {0}"
@@ -5482,6 +5557,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "An empty value deletes the key."
-msgstr "Пустое значение удаляет ключ."
+#, fuzzy
+msgid "An empty value deletes the tag."
+msgstr "Пустое значение удаляет тег."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
@@ -5506,4 +5582,12 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
+#: ../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] "Количество изменяемых объектов: {0}"
+msgstr[1] "Это изменит до {0} объектов."
+msgstr[2] "Это изменит до {0} объектов."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5580,58 +5664,54 @@
 #. 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 "Отношения"
 
-#: ../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 "Показать список всех отношений."
 
-#: ../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 "Отношения: {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 "Открыть редактор для выбранного отношения"
 
-#: ../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 "Удалить выбранное отношение"
 
-#: ../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 "Создать новое отношение"
 
-#: ../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 "Удалить выбранное отношение"
-
-#: ../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 "Выберите один из вариантов:"
-
-#: ../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 "Скачать выбранные отношения"
-
-#: ../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 "Скачать участников"
@@ -5648,9 +5728,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
-msgstr "Масштаб по выделенным объектам"
+msgstr "Приблизиться к выделенным элементам"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
 msgid "Zoom to selection"
-msgstr "Масштаб по выделению"
+msgstr "Приблизиться к выделенному"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
@@ -5752,9 +5832,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
 msgid "Download all child relations (recursively)"
-msgstr "Скачать все отношения наследника (рекурсивно)"
+msgstr "Скачать все дочерние элементы (рекурсивно)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
-msgstr "Скачать всех наследников"
+msgstr "Скачать все дочерние элементы"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
@@ -5764,5 +5844,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
-msgstr "Скачать выбранных наследников"
+msgstr "Скачать дочерние элементы для выбранного"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
@@ -5784,6 +5864,5 @@
 "loaded"
 msgstr ""
-"<html>Наследник отношения<br>{0}<br>удален с сервера. Он не может быть "
-"загружен"
+"<html>Дочерний элемент<br>{0}<br>удален с сервера. Он не может быть загружен"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352
@@ -5799,5 +5878,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}"
@@ -5808,5 +5887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
-msgstr "Метки и участники"
+msgstr "Теги и участники"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
@@ -5817,5 +5896,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
-msgstr "Наследники отношения"
+msgstr "Дочерние элементы отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
@@ -6018,5 +6097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
-msgstr "Добавить пустую метку"
+msgstr "Добавить пустой тег"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
@@ -6067,19 +6146,20 @@
 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
+#, fuzzy
+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 "Масштабирование отменено, потому что вы не выбрали участника"
@@ -6100,7 +6180,7 @@
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr "Ожидалось значение наследника.getId() > 0. Получено {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -6111,5 +6191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
 msgid "including immediate children of parent relations"
-msgstr "включая непосредственных наследников родительских отношений"
+msgstr "включая непосредственные дочерние элементы отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
@@ -6176,7 +6256,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "В данный момент нет открытого пакета изменений"
+msgstr ""
+"<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6186,14 +6266,14 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
+"<html><strong>Текущая область для скачивания с сервера</strong> (minlat,"
+"minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Создать границы"
+msgstr "Создать закладку"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Изменить выбранное отношение"
+msgstr "Добавить закладку к области,  выделенной в настоящий момент"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6201,10 +6281,12 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"В настоящий момент вы не указали область для скачивания. Пожалуйста выберите "
+"её."
 
 #: ../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 "Пожалуйста, введите название места."
+msgstr ""
+"Пожалуйста, введите название закладки для скачиваемой с сервера области."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6214,12 +6296,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Переместить выделенных участников отношения вверх"
+msgstr "Удалить выделенные закладки"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Переместить выделенных участников отношения вверх"
+msgstr "Переименовать выделенные закладки"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6244,5 +6324,5 @@
 "area)"
 msgstr ""
-"URL с www.openstreetmap.org (вы можете вставить URL сюда чтобы скачать "
+"URL с www.openstreetmap.org (вы можете вставить URL сюда, чтобы скачать "
 "область)"
 
@@ -6255,17 +6335,17 @@
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
-msgstr ""
+msgstr "Строка ''{0}'' не является правильным двойным значением."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Значение широты должно быть в пределах [-90,90]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Значение долготы должно быть в пределах  [-180,180]."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "Вставьте ссылку из буфера"
 
 #. adding the download tasks
@@ -6279,7 +6359,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Разделить линию в выделенной точке."
+msgstr "Пометьте, чтобы скачать с сервера данные OSM, для выделенной области."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6288,7 +6367,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Выделенная линия не содержит все выделенные точки"
+msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6301,4 +6379,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Пометьте, чтобы скачать данные в новый слой данных.<br>Снимите "
+"пометку, чтобы скачать данные с сервера в текущий активный слой.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -6312,7 +6392,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Нет выделенного отношения"
+msgstr "Область ещё не выбрана"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6327,17 +6406,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Щёлкните, чтобы закрыть диалог и отменить удаление объектов"
+msgstr "Нажмите, чтобы закрыть диалог и прервать скачивание с сервера"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Изменить выбранное отношение"
+msgstr "Нажмите, чтобы скачать с сервера выделенную область"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Пожалуйста, выберите ряд для редактирования."
+msgstr "Пожалуйста, выделите сначала область для скачивания с сервера."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6347,4 +6423,7 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>Ни <strong>{0}</strong> ни <strong>{1}</strong> не назначено."
+"<br>Пожалуйста выберите, скачать только данные OSM с сервера, или только "
+"данные GPX, или и то и другое.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
@@ -6353,34 +6432,31 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Название места для поиска:"
+msgstr "Введите название места для поиска"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Области вокруг мест"
 
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
-msgstr "Пустой указатель исключение, возможно есть отсутствующие метки"
+msgstr "Пустой указатель исключение, возможно есть отсутствующие теги"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Поиск..."
+msgstr "Найти ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Направление для поиска места"
+msgstr "Нажмите, чтобы начать поиск мест"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
 msgid "Querying name server"
-msgstr ""
+msgstr "Запрос на сервер имён"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Запрос на сервер имён ..."
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7302,7 +7378,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "возле"
+msgstr "Возле"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7351,5 +7426,5 @@
 msgstr "Браузер справки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7370,5 +7445,5 @@
 "статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
 #, java-format
 msgid ""
@@ -7383,5 +7458,5 @@
 "<br><tt>{1}</tt></p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
 #, java-format
 msgid ""
@@ -7392,19 +7467,19 @@
 "сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
 
-#: ../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 ""
@@ -7416,33 +7491,33 @@
 
 #. 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 "Перейти на начальную страницу справки JOSM"
 
-#: ../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 ""
 "Предупреждение: плохое расположение в документе HTML. Исключение было: "
 
-#: ../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 "Не удалось открыть справочную страницу"
@@ -7465,38 +7540,38 @@
 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 "История точки {0}"
 
-#: ../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 "История линии {0}"
 
-#: ../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 "История для отношения {0}"
 
-#: ../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 ""
@@ -7505,5 +7580,5 @@
 "Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7511,9 +7586,9 @@
 msgstr "Не удалось настроить ссылку. Версия ссылки {0} отсутствует в истории."
 
-#: ../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 ""
@@ -7524,24 +7599,34 @@
 "истории."
 
-#: ../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 "требуется параметр ''{0}'' > 0. Получен {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr "Ожидался объект с id > 0 . Получено {0}"
 
-#: ../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 "Скачивание истории для точки {0}"
 
-#: ../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 "Скачивание истории линии {0}"
 
-#: ../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}"
@@ -7554,4 +7639,22 @@
 msgstr "Точка {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Приблизиться к проблеме"
+
+#: ../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 "Загрузить историю"
+
+#: ../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
@@ -7564,13 +7667,59 @@
 msgstr "Отношение {0}"
 
-#: ../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 "Сортировать меню заготовок"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Пользователь"
 
-#: ../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 "неизвестный"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
 #, java-format
 msgid ""
@@ -7578,4 +7727,9 @@
 msgstr ""
 "<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "<анонимный>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7600,4 +7754,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Версия {0} дата создания: {1} автор: {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "удалён"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Версия {0} дата создания: {1} автор: {2}"
 
@@ -7958,9 +8127,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Tags of new changeset"
-msgstr "Метки нового пакета правок"
+msgstr "Теги нового пакета правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
 msgid "Apply tags to the changeset data is uploaded to"
-msgstr "Применить метки на пакет правок, который загружен"
+msgstr "Применить теги на пакет правок, который загружен"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224
@@ -7985,10 +8154,10 @@
 
 #: ../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] "Изменить {0} объект:"
-msgstr[1] "Изменить {0} объекта:"
-msgstr[2] "Изменить {0} объектов:"
+msgstr[0] "{0} объект изменить:"
+msgstr[1] "{0} объекта изменить:"
+msgstr[2] "{0} объектов изменить:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -8072,16 +8241,16 @@
 #, java-format
 msgid "Tags of changeset {0}"
-msgstr "Метки пакета правок {0}"
+msgstr "Теги пакета правок {0}"
 
 #. 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
@@ -8154,5 +8323,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}..."
@@ -8164,5 +8333,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 "Изображения с данными о местоположении"
@@ -8188,5 +8357,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"
@@ -8242,43 +8411,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"
 
 #: ../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 "Настроить отрисовку линий"
 
 #: ../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 "Использовать глобальные настройки."
 
 #: ../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 "Отображать линии между точками для этого слоя."
 
 #: ../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 "Не отображать линии между точками для этого слоя."
 
 #: ../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 "Выбрать варианты отрисовки линий"
 
 #: ../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 "Выбрать цвет"
 
 #: ../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"
@@ -8286,6 +8455,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"
@@ -8378,10 +8547,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../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 "Преобразовать в слой данных"
 
-#: ../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."
@@ -8391,43 +8560,43 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../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 "Преобразовано из: {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 "Скачать с OSM данные вдоль этого трека"
 
-#: ../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 "Скачать всё в пределах:"
 
-#: ../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} метров"
 
-#: ../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 "Максимальная область для одного запроса:"
 
-#: ../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} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8438,9 +8607,9 @@
 "Продолжить?</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 "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../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 "
@@ -8450,5 +8619,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../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 "
@@ -8486,5 +8655,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8495,15 +8664,18 @@
 "server."
 msgstr[0] ""
-"{0} объект был очищен в локальном наборе данных, потому что он удалён на "
+"{0} конфликт был <strong>устранён автоматически</strong> путём очистки {0} "
+"объекта<br>из локального набора данных, так как объект уже был удалён на "
 "сервере."
 msgstr[1] ""
-"{0} объекта было очищено в локальном наборе данных, потому что они удалены "
-"на сервере."
+"{0} конфликта было <strong>устранёно автоматически</strong> путём очистки "
+"{0} объектов<br>из локального набора данных, так как объекты уже были "
+"удалёны на сервере."
 msgstr[2] ""
-"{0} объектов было очищено в локальном наборе данных, потому что они удалены "
-"на сервере."
+"{0} конфликтов было <strong>устранёно автоматически</strong> путём очистки "
+"{0} объектов<br>из локального набора данных, так как объекты уже были "
+"удалёны на сервере."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8513,48 +8685,47 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
-"Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
-"конфликты вручную."
+"Осталось устранить {0} конфликт.<br><br>Пожалуйста, откройте диалог списка "
+"конфликтов и устраните конфликт вручную."
 msgstr[1] ""
-"Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
-"конфликты вручную."
+"Осталось устранить {0} конфликта.<br><br>Пожалуйста, откройте диалог списка "
+"конфликтов и устраните конфликты вручную."
 msgstr[2] ""
-"Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
-"конфликты вручную."
+"Осталось устранить {0} конфликтов.<br><br>Пожалуйста, откройте диалог списка "
+"конфликтов и устраните конфликты вручную."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Закрыть этот диалог и продолжить редактирование в JOSM"
-
-#: ../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} удалено)"
-msgstr[1] " ({0} удалено)"
-msgstr[2] " ({0} удалено)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] "{0} удалён"
+msgstr[1] "{0} удалено"
+msgstr[2] "{0} удалено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../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: {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 "Преобразовать в слой GPX"
 
-#: ../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."
@@ -8565,5 +8736,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8573,5 +8744,5 @@
 msgstr[2] "треков"
 
-#: ../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"
@@ -8580,5 +8751,5 @@
 msgstr[2] "точек"
 
-#: ../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"
@@ -8588,5 +8759,5 @@
 msgstr[2] "трек с {0} точками"
 
-#: ../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"
@@ -8596,5 +8767,5 @@
 msgstr[2] "{0} состоит из {1} треков"
 
-#: ../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"
@@ -8604,9 +8775,9 @@
 msgstr[2] "{0} точек"
 
-#: ../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"
 
-#: ../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"
@@ -8615,5 +8786,5 @@
 msgstr[2] "маркеров"
 
-#: ../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"
@@ -8623,15 +8794,16 @@
 msgstr[2] "{0} состоит из {1} маркеров"
 
-#: ../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 "Синхронизировать аудио"
 
-#: ../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 ""
-"Вам необходимо приостановить звуковой файл в момент воспроизведения реплик."
-
-#: ../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
@@ -8639,14 +8811,14 @@
 msgstr "Аудио синхронизировано на точке {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 "Невозможно синхронизировать слой который используется"
 
-#: ../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 "Установить маркер аудио на позиции проигрывания"
 
-#: ../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 "
@@ -8656,13 +8828,13 @@
 "маркер."
 
-#: ../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 "Нет существующих аудио маркеров на этом слое"
 
-#: ../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 "Показать/скрыть текст/значки"
 
-#: ../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 "Показать/скрыть текст и значки маркеров."
@@ -8730,5 +8902,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 "Пожалуйста, выберите ряд для редактирования."
@@ -8742,5 +8914,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."
@@ -8892,5 +9064,5 @@
 #, java-format
 msgid "Paint style {0}: {1}"
-msgstr "Стиль точки {0}:{1}"
+msgstr "Стиль рисования {0}:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143
@@ -8910,9 +9082,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168
 msgid "Set to default"
-msgstr "Задать в значение по умолчанию"
+msgstr "Установить значение по умолчанию"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
 msgid "Set all to default"
-msgstr "Задать все значения по умолчанию"
+msgstr "Установить все значения по умолчанию"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230
@@ -9057,5 +9229,5 @@
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
-"Показывать только полезные подсказки направления (например - с меткой дороги "
+"Показывать только полезные подсказки направления (например - с тегом дороги "
 "с односторонним движением)."
 
@@ -9444,12 +9616,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Включить"
+msgstr "Активные стили"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Доступные стили (из {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9484,68 +9655,64 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Добавить название файла или ссылку на активные стили"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Удалить выделенные записи из объединённого списка элементов"
+msgstr "Удалить выбранные стили из списка активных стилей"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Изменить значение выбранного ключа для всех объектов"
+msgstr "Заменить имя файла или ссылку для выбранного активного стиля"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Удалить выделенные записи из объединённого списка элементов"
+msgstr "Добавить выделенные доступные стили к списку активных стилей"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Скачать заново список доступных стилей из ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Добавить новую метку"
+msgstr "Добавить новый путь к значкам"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Закрыть выбранные открытые пакеты правок"
+msgstr "Удалить выделенные пути к значкам"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Править выбранный источник."
+msgstr "Править выделенные пути к значкам"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Скачивание истории для точки {0}"
+msgstr "Загрузить источники стилей из ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Невозможно загрузить на сервер или скачать данные<br>''{0}''<br>из-за "
-"проблемы передачи данных.<br>Подробнее: {1}</html>"
+"<html>Не удалось загрузить список источников стилей из<br>''{0}''."
+"<br><br>Подробности (на англ.):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "IНеверное значение для атрибута ''{0}''. Получено''{1}''."
+msgstr ""
+"Предупреждение: неверный формат или запись в списке стилей ''{0}''. Получено "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
-msgstr "Сортировать меню предустановок"
+msgstr "Сортировать меню заготовок"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
-msgstr "Предустановки меток"
+msgstr "Заготовки с тегами"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183
@@ -9738,9 +9905,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
-msgstr "Добавить новую метку"
+msgstr "Добавить новый тег"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
-msgstr "Удалить отмеченное в таблице меток"
+msgstr "Удалить отмеченное в таблице тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
@@ -9770,5 +9937,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "Не удалось прочитать источник предустановок меток: {0}"
+msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
@@ -9811,10 +9978,10 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Группа предустановок {1} / {0}"
+msgstr "Группа заготовок {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr "Группа предустановок {0}"
+msgstr "Группа заготовок {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
@@ -9834,5 +10001,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
 msgid "NullPointerException, possibly some missing tags."
-msgstr "Ошибка! Возможно отсутствуют метки."
+msgstr "Ошибка! Возможно отсутствуют теги."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69
@@ -10169,5 +10336,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}''."
@@ -10194,5 +10361,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}."
@@ -10200,5 +10367,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}"
@@ -10211,5 +10378,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}''."
@@ -10374,5 +10541,5 @@
 msgstr "Файл \"{0}\" не существует"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10383,30 +10550,30 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 "Найти элемент XML <nd> не как прямого наследника элемента <way>."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
+msgstr "Найден элемент XML <nd>, не являющийся дочерним элементом для <way>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Отсутствует обязательный атрибут ''{0}'' на <nd> линии {1}."
 
-#: ../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 "Неверное значение атрибута ''ref'' элемента <nd>. Получено {0}."
 
-#: ../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 ""
-"Найденный элемент XML <member> (участник) не прямой наследник элемента "
-"<relation> (отношение)."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
+"Найден элемент XML <member>, не являющийся дочерним элементом для отношения "
+"<relation>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}."
 
-#: ../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}"
@@ -10414,10 +10581,10 @@
 "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}"
 
-#: ../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 "Отсутствует атрибут ''type'' у участника {0} отношения {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10427,9 +10594,9 @@
 "{2}."
 
-#: ../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 "Неполная спецификация <member> с 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."
@@ -10437,10 +10604,10 @@
 "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено."
 
-#: ../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 "Недопустимый объект с 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 ""
@@ -10453,9 +10620,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 ""
@@ -10467,25 +10634,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 "Неизвестная или неподдерживаемая версия API. Получено {0}."
 
-#: ../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 "Отсутствует атрибут ''version'' на элементе OSM с ID {0}."
 
-#: ../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 "Отсутствует нужный атрибут ''{0}''."
 
-#: ../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 "Неверная длина значения атрибута ''{0}''. Получено ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
 #, java-format
 msgid ""
@@ -10494,5 +10661,5 @@
 "Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10503,5 +10670,5 @@
 "мере одна точка отсутствовала в скачанных данных."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10510,5 +10677,5 @@
 "Неизвестный тип участника отношения ''{0}'' в отношении с внешним id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10519,13 +10686,13 @@
 "внешним id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "Разбор данных OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Подготовка набора данных..."
@@ -10598,5 +10765,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
 msgid "XML tag <user> is missing."
-msgstr "Отсутствует метка XML <user>."
+msgstr "Отсутствует тег XML <user>."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
@@ -10606,5 +10773,5 @@
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
-msgstr "Отсутствует атрибут ''{0}'' на метке XML ''{1}''."
+msgstr "Отсутствует атрибут ''{0}'' на теге XML ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
@@ -10614,5 +10781,5 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
-msgstr "Неверное значение атрибута ''{0}'' на метке XML ''{1}''. Получено {2}."
+msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73
@@ -10685,14 +10852,14 @@
 
 #: ../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} модуль успешно скачен. Пожалуйста, перезагрузите JOSM."
-msgstr[1] "{0} модуля успешно скачено. Пожалуйста, перезагрузите JOSM."
-msgstr[2] "{0} модулей успешно скачено. Пожалуйста, перезагрузите JOSM."
+msgstr[0] "{0} модуль скачан успешно."
+msgstr[1] "{0} модуля скачаны успешно."
+msgstr[2] "{0} модулей скачано успешно."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Пожалуйста, перезапустите JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -10745,4 +10912,7 @@
 "Update plugins now?"
 msgstr ""
+"Вы обновили приложение JOSM.\n"
+"Чтобы избежать проблем, модули тоже надо обновить.\n"
+"Обносить модули сейчас?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
@@ -10753,5 +10923,4 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
 msgstr "Обновить модули"
@@ -10759,5 +10928,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Skip update"
-msgstr ""
+msgstr "Пропустить обновление"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
@@ -10898,35 +11067,4 @@
 "{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 "неизвестный"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -11067,11 +11205,11 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
 "(untranslated):<br>{0}</html>"
 msgstr ""
-"<html>Сервер сообщил, что обнаружен конфликт.<br>Сообщение об ошибке (не "
-"переведено):<br>{0}"
+"<html>Сервер сообщил, что он обнаружил конфликт.<br>Сообщение об ошибке "
+"(англ.):<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
@@ -11373,9 +11511,9 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
-msgstr "Метки (разделённые запятой)"
+msgstr "Теги (разделённые запятой)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
 msgid "Please enter tags about your trace."
-msgstr "Введите метки, описывающие ваш трек."
+msgstr "Введите теги, описывающие ваш трек."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
@@ -11573,9 +11711,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoJ - Изображения с геометками"
+msgstr "AgPifoJ - Изображения с геотегами"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "Display geotagged photos"
-msgstr "Показать изображения с геометками"
+msgstr "Показать изображения с геотегами"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
@@ -11619,50 +11757,49 @@
 "{0} км/ч"
 
-#: ../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 координат из EXIF"
 
-#: ../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 "Запуск сканирования каталога"
 
-#: ../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 "Один из выбранных файлов пуст!"
-
-#: ../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 "Загрузка фото..."
 
-#: ../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 "Не удалось получить канонический путь к каталогу {0}\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 "Скнирование каталога {0}"
 
-#: ../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 "Найден пустой файл в каталоге {0}\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 "Ошибка чтения файлов в каталоге {0}\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 "Коррелируют с GPX"
 
-#: ../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."
-msgstr "{0} изображений имело метки GPS"
+msgstr "{0} изображений имело теги GPS"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
@@ -11675,24 +11812,24 @@
 msgstr "Загрузить набор изображений на новый слой."
 
-#: ../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 (*.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 "Файл {0} загружен под именем \"{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 "Ошибка разбора {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 "Невозможно прочитать \"{0}\""
 
-#: ../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."
@@ -11704,34 +11841,34 @@
 "прочитаете на фото и выберите часовой пояс <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 "Время фотоснимка (из 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 (прочтите на фото вверху): "
 
-#: ../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 " [дд/мм/гггг чч:мм:сс]"
 
-#: ../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 "Я нахожусь в часовом поясе: "
 
-#: ../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 "Без даты"
 
-#: ../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 "Открыть другое фото"
 
-#: ../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 "Синхронизация времени с фотографией GPS-приемника"
 
-#: ../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"
@@ -11741,70 +11878,70 @@
 "Пожалуйста, используйте запрашиваемый формат"
 
-#: ../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 "Недопустимая дата"
 
-#: ../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 "<Не загружены треки GPX>"
 
-#: ../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: "
 
-#: ../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 "Открыть другой трек GPX"
 
-#: ../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 "Часовой пояс: "
 
-#: ../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 "Смещение:"
 
-#: ../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>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</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 "Обновление позиции для: "
 
-#: ../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 "Все изображения"
 
-#: ../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 "Изображения без координат в заголовках Exif"
 
-#: ../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 "Картинки без меток"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
+msgstr "Картинки без тегов"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../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 "Совпадения"
 
-#: ../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 "Авто-Угадывание"
 
-#: ../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 "Необходимо выбрать трек GPX"
 
-#: ../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 "Трек GPX не выделен"
 
-#: ../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 ""
@@ -11815,9 +11952,9 @@
 "Ожидаемый формат: {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 "Недопустимый часовой пояс"
 
-#: ../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 ""
@@ -11828,26 +11965,26 @@
 "Ожидаемый формат: {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 "Недопустимое смещение"
 
-#: ../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} совпадений из {1} в GPX треке {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 загружен"
 
-#: ../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 "ыбранные фотографии не содержат информацию о времени."
 
-#: ../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 "Фотографии не содержать информацию о времени"
 
-#: ../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."
@@ -11855,39 +11992,39 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../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 трек не содержит информации о времени"
 
-#: ../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 "Часовой пояс: {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 "Минуты: {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 "Секунды: {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} из {1} фотографий с GPX треком."
 
-#: ../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 "(Разница во времени {0} дней)"
 
-#: ../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 "Смещение между треком и фотографией: {0}м {1}с"
 
-#: ../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 "
@@ -11897,13 +12034,13 @@
 "можете вручную сопоставить фотографии использую ползунки."
 
-#: ../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 "Сопоставление фотографий треку прервано"
 
-#: ../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 "Настройка часового пояса и смещения"
 
-#: ../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 "Значения по умолчанию"
@@ -11924,5 +12061,5 @@
 msgstr "Ошибка в файле {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11938,37 +12075,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 "Выбрать Feuille (слой??)"
 
-#: ../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 "Ошибка при загрузке файла"
 
-#: ../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 "Lambert зона 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 "Lambert зона 21 кэш файл (.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 "Lambert зона 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 "Lambert зона 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: Не правильная ссылка"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11982,18 +12119,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 "Выберите коммуну"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Выбрать из..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Авто источники"
@@ -12025,34 +12162,34 @@
 "было: {0}"
 
-#: ../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 "Заменить оригинальный фон 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 "Обратить серые цвета (для черного фона)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Установить прозрачный фон."
 
-#: ../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 "Нарисовать границы скачанных данных."
 
-#: ../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 "Включить автоматическое кеширование."
 
-#: ../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 "Макс. размер кеша (МБ)"
 
-#: ../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."
@@ -12070,18 +12207,18 @@
 "данных, созданный этим модулем."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "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 "<html>Значение тега \"source\" когда включенs автоисточники</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Источник"
 
-#: ../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 "
@@ -12090,5 +12227,5 @@
 "Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM."
 
-#: ../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). "
@@ -12098,76 +12235,76 @@
 "Полезно для текстов на темном фоне."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Позволяет соединять несколько слоев"
 
-#: ../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 ""
 "Установить прозрачность слоев  WMS. С право непрозрачный, слева прозрачный."
 
-#: ../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 "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS."
 
 #. 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 ""
 "Взять мелкие изображения (высокое качество, но использует больше памяти)"
 
-#: ../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 "Фиксированный размер площади (по умолчанию 100 м)"
 
-#: ../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 "Фиксированный размер (от 25 до 1000 метров)"
 
-#: ../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 "Более старые файлы автоматически удаляются, когда этот размер превышен"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
-msgstr "Добавлен источник авто-метки:"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+msgstr "Добавлен источник авто-тега:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Добавить \"source=...\" к элементам?"
 
-#: ../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}"
 
-#: ../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 "Соединение с WMS Server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Создание зданий"
 
-#: ../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"
@@ -12177,30 +12314,30 @@
 "размер импортируемого здания ограничено, максимум 1 км2 ."
 
-#: ../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 "Пожалуйста, включите Авто-источники и проверте 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"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Выделить лучшее расположение границы"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Создать границы"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Связываюсь с кадастром WMS ..."
 
-#: ../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"
@@ -12210,29 +12347,29 @@
 "Используйте нормальное меню захвата кадастра."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "Выделить общие границы"
 
-#: ../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 "Только на векторизованных слоях"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Выделить основание здания"
 
-#: ../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 "Скачать изображение с французского Cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Кадастр: {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"
@@ -12244,13 +12381,13 @@
 "проекций и попытайтесь ещё раз"
 
-#: ../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"
@@ -12260,5 +12397,5 @@
 "Вы хотите воспользоваться ими?"
 
-#: ../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"
@@ -12268,14 +12405,14 @@
 "(Требуется отметить две точки)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../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:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 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"
@@ -12285,14 +12422,14 @@
 "(Всего нужно две точки)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../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:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Отметьте вторую поперечину Lambert для геопривязки"
 
-#: ../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"
@@ -12302,64 +12439,64 @@
 "или только попытаться снова "
 
-#: ../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 "Установить {0} Lambert координаты"
 
-#: ../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 "Задать вручную Lambert zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Zone"
 msgstr "Зона"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Зона Ламберта"
 
-#: ../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 "Загрузка расположения из кэша (только если кэш включен)"
 
-#: ../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 "{0} не позволено в текущей проекции"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Изменить расположение"
 
-#: ../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 "Установить новое место для следующего запроса"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Добавить новый слой"
 
-#: ../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 "Расположение"
 
-#: ../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 "
@@ -12369,25 +12506,25 @@
 "пунктуацию опубликованную 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 "Добавить новый слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Сбросить куки"
 
-#: ../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 "Получить новые кукисы (тайм-аут сеанса)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "Файлы PNG (*.png)"
 
-#: ../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 "Экспортировать в формате PNG (только растровые изображения)"
 
-#: ../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
@@ -12398,14 +12535,14 @@
 msgstr[2] "Упростить линию (удалить {0} точек)"
 
-#: ../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"
 
-#: ../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 "Подогнать позицию WMS слоя (только растровые изображения)"
 
-#: ../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"
@@ -12415,5 +12552,5 @@
 "кадастра \"plan image\" (растровое изображение)"
 
-#: ../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
@@ -12421,5 +12558,5 @@
 msgstr "Скачать квадрат карты WMS из {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"
@@ -12429,34 +12566,34 @@
 "Выберите сначала один из них, а затем повторите"
 
-#: ../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 "Пустой слой"
 
-#: ../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 ({0}), квадратов загружено: {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../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 "Размер растра: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Векторизован."
 
-#: ../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 "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12467,18 +12604,18 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../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 "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12529,9 +12666,9 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 msgid "Split area"
-msgstr "Разделить область"
+msgstr "Разделить полигон"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
 msgid "Splits an area by an untagged way."
-msgstr "Разрезает область на линии без меток."
+msgstr "Разрезает полигон на линии без тегов."
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76
@@ -12541,7 +12678,7 @@
 "Remove the area from the relation before splitting it."
 msgstr ""
-"Выделенная обасть не может быть разрезана, потому что она является "
-"участником отношений.\n"
-"Удалите область из отношения, прежде чем разрезать её."
+"Выделенный полигон не может быть разрезан, потому что он является участником "
+"отношений.\n"
+"Удалите полигон из отношения, прежде чем разрезать его."
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
@@ -12592,9 +12729,9 @@
 msgstr "Создать копию линии"
 
-#: ../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 "Слой для редактирования GPX треков"
 
-#: ../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 "Преобразовать в GPX слой с обезличенным временем"
@@ -12611,11 +12748,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 "Импортировать путь из слоя данных GPX"
 
 #: ../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 "Очистить существующий путь"
@@ -12625,5 +12762,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 "Не найдено слоя данных GPX"
@@ -12834,7 +12971,7 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr "Показать фотографии без геометок"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
+msgstr "Показать фотографии без геотегов"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
 msgid "Imported Images"
 msgstr "Импортированные изображения"
@@ -13039,5 +13176,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Tag ways as"
-msgstr "Пометить линии, как"
+msgstr "Назначить на линии теги:"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
@@ -13116,5 +13253,5 @@
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
-"Назначить метки на линии: water (вода), coastline (берега), land (земли) или "
+"Назначить на линии теги: water (вода), coastline (берега), land (земли) или "
 "ничего. По умолчанию - вода."
 
@@ -13262,5 +13399,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
 msgid "Selection Area"
-msgstr "Площадь выделения"
+msgstr "Область выделения"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
@@ -13272,5 +13409,5 @@
 msgstr "Угол между двумя выделенными точками"
 
-#: ../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 "Слой для проведения измерений"
@@ -13351,5 +13488,5 @@
 msgstr "Цикл скачивания из 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"
@@ -13494,7 +13631,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Слой"
+msgstr "PicLayer"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13664,43 +13800,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 "Интерактивная карта"
 
-#: ../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 "Авто приближение: "
-
-#: ../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 "Загрузить квадрат карты"
 
-#: ../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 "Показать информацию"
-
-#: ../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 "Скачать все квадраты карты"
 
-#: ../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 "Приблизить"
 
-#: ../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 "Отодвинуть"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgstr "Отдалить"
+
+#: ../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
+msgstr "Привязаться к размеру квадрата"
+
+#: ../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 "изображение "
@@ -13708,5 +13842,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
-msgstr "Автозум"
+msgstr "Автомасштабирование"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
@@ -13736,7 +13870,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Уровень макс. приближения: "
+msgstr "Уровень мин. приближения: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13815,5 +13948,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
 msgid "Edit tags"
-msgstr "Редактировать метки"
+msgstr "Редактировать теги"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -13821,9 +13954,9 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64
 msgid "Launches the tag editor dialog"
-msgstr "Открывает диалог редактора меток"
+msgstr "Открывает диалог редактора тегов"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
-msgstr "Модуль редактирования меток JOSM"
+msgstr "Модуль редактирования тегов JOSM"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -13862,5 +13995,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr "Анализатор предустановленных меток"
+msgstr "Анализатор заготовок тегов"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
@@ -13868,12 +14001,11 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
-"Откройте средство анализа предустановленных меток, чтобы воспользоваться "
-"диалогом просмотра этих меток."
+"Откройте средство анализа заготовок тегов, чтобы воспользоваться диалогом "
+"просмотра этих тегов."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-"В первую очередь Вы должны указать в настройках источники предустановленных "
-"меток."
+"В первую очередь Вы должны указать в настройках источники заготовок тегов."
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -13934,13 +14066,13 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
-msgstr "Объединить накладывающиеся области"
+msgstr "Объединить накладывающиеся полигоны"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Joins areas that overlap each other"
-msgstr "Объединить области, накладывающиеся друг на друга"
+msgstr "Объединить полигоны, накладывающиеся друг на друга"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127
 msgid "Only up to two areas can be joined at the moment."
-msgstr "Только два района могут быть объединены в данный момент."
+msgstr "Только два полигона могут быть объединены в данный момент."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132
@@ -13990,9 +14122,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
-msgstr "Присоединить самоперекрывающиеся области"
+msgstr "Объединённый самоперекрывающийся полигон"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
-msgstr "Присоединить перекрывающиеся области"
+msgstr "Объединённые наложенные полигоны"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
@@ -14014,5 +14146,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
-msgstr "Исправить конфликт меток"
+msgstr "Исправить конфликт тегов"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
@@ -14022,5 +14154,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
-msgstr "Присоединить районы: удаление коротких путей"
+msgstr "Объединить полигоны: короткие линии удаляются"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
@@ -14030,9 +14162,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
-msgstr "Удалить метки у внутренних линий"
+msgstr "Удалить теги у внутренних линий"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
-msgstr "Присоединить районы функционирования"
+msgstr "Функция объединения полигонов"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
@@ -14100,6 +14232,6 @@
 msgstr "Вы уверены?"
 
-#: ../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
@@ -14107,5 +14239,5 @@
 msgstr "Ошибки при проверке"
 
-#: ../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 "Проверка не выявила ошибок"
@@ -14196,5 +14328,5 @@
 msgstr "другое при проверке"
 
-#: ../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}"
@@ -14233,5 +14365,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:89
 msgid "Zoom to problem"
-msgstr "Показать проблему"
+msgstr "Приблизиться к проблеме"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110
@@ -14294,7 +14426,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Несоединённая береговая линия"
+msgstr "Неприсоединённая береговая линия"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -14327,18 +14458,18 @@
 msgstr "Пересекающиеся линии"
 
-#: ../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 "Дублированные точки"
 
-#: ../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 "Этот тест проверяет, чтобы не было наложенных точек."
 
-#: ../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 "Подтверждение"
@@ -14354,5 +14485,5 @@
 "coordinates."
 msgstr ""
-"Этот тест проверяет - есть ли линии с одними и теми же метками и одинаковыми "
+"Этот тест проверяет - есть ли линии с одними и теми же тегами и одинаковыми "
 "координатами точек."
 
@@ -14417,17 +14548,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
-msgstr "Накладывающиеся области"
+msgstr "Наложение полигонов"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
-msgstr "Перекрытие магистралей (местами)"
+msgstr "Наложение магистралей (на полигоны)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
-msgstr "Перекрытие железнодорожных путей (местами)"
+msgstr "Наложение железнодорожных путей (на полигоны)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
-msgstr "Перекрытие линий (местами)"
+msgstr "Наложение линий (на полигоны)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
@@ -14475,5 +14606,5 @@
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Неправильная линия анализатора меток - {0}: {1}"
+msgstr "Неправильная линия анализатора тегов - {0}: {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
@@ -14495,84 +14626,84 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
-msgstr "Неправильная комбинация меток/значений"
+msgstr "Неправильная комбинация тегов/значений"
 
 #. 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 "Проблемы отображения"
 
-#: ../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 "Неправильный ключ {0}."
 
-#: ../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 "Метки с пустыми значениями"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+msgstr "Теги с пустыми значениями"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Invalid property key"
 msgstr "Неверный ключ свойств"
 
-#: ../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 "Неправильный пробел в названии ключа"
 
-#: ../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 "Значение начинается или заканчивается пробелом"
 
-#: ../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 "Значения содержат HTML разметку"
 
-#: ../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 "Ключа ''{0}'' нет в настройках."
 
-#: ../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 "Установки не содержат собственно ключа"
 
-#: ../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 "Значение ''{0}'' для ключа ''{1}'' не установлены заранне."
 
-#: ../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 "Не содержит зарание устанвленного значения"
 
-#: ../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 "FIXMES"
 
-#: ../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 "Проверить корректность ключей."
 
-#: ../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 "Проверьте, что ключ действителен проверен в отношении списка слов."
 
-#: ../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 "Использовать сложную проверку"
 
-#: ../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 "Проверка корректности значений и меток, использующих сложные правила."
-
-#: ../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
+msgstr "Проверка корректности значений и тегов, использующих сложные правила."
+
+#: ../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 "Источник средства проверки меток"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+msgstr "Источник средства проверки тегов"
+
+#: ../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."
@@ -14580,28 +14711,27 @@
 msgstr ""
 "Источники (URL или имя файла) проверки правописания (см. http://wiki."
-"openstreetmap.org/index.php/User:JLS/speller) или метка проверки файлов "
-"данных."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+"openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Add a new source to the list."
 msgstr "Добавить в список новый источник."
 
-#: ../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 "Править выбранный источник."
 
-#: ../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 "Удалить источник из списка."
 
-#: ../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 "Источники данных"
 
-#: ../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 "Проверить корректность значений"
 
-#: ../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 ""
@@ -14609,42 +14739,42 @@
 "установок проверки."
 
-#: ../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 "Проверить для FIXMES."
 
-#: ../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 "Ищет точки или линии с FIXME в свойствах какого-либо значения."
 
-#: ../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 "Проверить заметки."
 
-#: ../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 "Проверить содержит ли нарисованная карта ошибки данных"
 
-#: ../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 "Использовать файл данных по умолчанию."
 
-#: ../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 "Используется файл данных установленный по умолчанию"
 
-#: ../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
+msgstr "Использовать по умолчанию файл с игнориованными тегами."
+
+#: ../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 "Использовать установленный по умолчанию файл проверки правописания"
 
-#: ../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 ""
@@ -14652,22 +14782,22 @@
 "(рекомендуется)"
 
-#: ../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 "Исправить параметры"
 
-#: ../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 "Не удалось найти тип элемента"
 
-#: ../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 "Не удалось найти  уровень предупреждения"
 
-#: ../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 "Недопустимое выражение ''{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}''"
@@ -14828,5 +14958,5 @@
 #: build/trans_style.java:4202
 msgid "area"
-msgstr "область"
+msgstr "полигон"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:122
@@ -14843,17 +14973,17 @@
 "Этот тест ищет линии, конец которых расположен очень близко к другой линии."
 
-#: ../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 "Последняя точка линии расположена около другой дороги"
 
-#: ../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 "Конец линии расположен около другой линии"
 
-#: ../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 "Точка линии расположена около другой линии"
 
-#: ../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 "Конечная точка присоединённой линии расположена около другой линии"
@@ -14862,18 +14992,19 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
-msgstr "Непомеченные метками и не соединённые точки"
+msgstr "Непомеченные тегами и не соединённые точки"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
 msgid "This test checks for untagged nodes that are not part of any way."
-msgstr "Этот тест ищет точки, не имеющие меток, и не являющиеся частью линий."
+msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
-msgstr "Линии без меток, пустые и состоящие из одной точки."
+msgstr "Линии без тегов, пустые и состоящие из одной точки."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
-"Данный тест ищет линии без меток, пустые, и линии, состоящие из одной точки"
+"Данный тест ищет линии без тегов, пустые, а также линии, состоящие из одной "
+"точки"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
@@ -14887,5 +15018,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
-msgstr "Линии без меток"
+msgstr "Линии без тегов"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
@@ -14905,13 +15036,13 @@
 msgstr "Этот тест проверяет направление береговых линий."
 
-#: ../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 "Неверное направление береговой линии: земля не слева"
 
-#: ../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 "Неверное направление границы водоёма: земля не слева"
 
-#: ../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 "Неверное направление линии суши: земля не слева"
@@ -14950,7 +15081,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 ({0}), в масштабе {1}"
+msgstr "Слой ({0}) Walking Papers в масштабе {1}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14958,84 +15089,69 @@
 msgstr "Walking Papers"
 
-#: ../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"
-msgstr "Достигнут перекрёсток"
+#: ../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 "Скачать"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Скачать картографические данные с сервера OSM."
+
+#: ../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>Нет слоёв, с которым исходный слой<br>''{0}''<br>может быть объединён."
+"</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 "Удаление повторяющихся точек..."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#, fuzzy
+msgid "<html>No more connected ways to download.</html>"
+msgstr ""
+"<html>В настоящий момент не выбрана область для скачивания с сервера.</html>"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Произошла ошибка."
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "Справка"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Справка / О модуле"
-
-#: ../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 ""
-"Можно добавлять, редактировать и удалять сервисы WMS на вкладке \"Параметры "
-"модуля WMS\" - они будут отображены в меню WMS.\n"
-"\n"
-"Также можно сделать это вручную в \"Расширенных настройках\", используя "
-"следующую схему:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... и так далее\n"
-"\n"
-"Пример входного формата: полный URL WMS (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , всё "
-"что нужно - ввести соответствующий 'id'.\n"
-"Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
-"приведённом примере, заменив 73 на 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"
-"Примечание: Убедитесь что использование изображения легально, если в этом "
-"есть хоть какие-то сомнения - не используйте его."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Справка по модулю WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -15147,9 +15263,9 @@
 "Это может привести к неправильным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Автоматическое скачивание"
 
-#: ../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}''"
@@ -15158,19 +15274,19 @@
 "искажена"
 
-#: ../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 ({0}), в масштабе {1}"
 
-#: ../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 ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -15185,13 +15301,13 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../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"
@@ -15200,37 +15316,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные квадраты карты"
 
-#: ../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 в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../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}"
@@ -15238,5 +15354,5 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
@@ -15363,6 +15479,6 @@
 "import EXIF geotagged pictures."
 msgstr ""
-"Модуль геометки для JOSM. Совмещает фотографии с GPS треками или импортирует "
-"геометки из EXIF фотографий."
+"Модуль геотега для JOSM. Совмещает фотографии с GPS треками или импортирует "
+"геотеги из EXIF фотографий."
 
 #. Plugin cadastre-fr
@@ -15380,9 +15496,9 @@
 "true :-)"
 msgstr ""
-"Позволяет пользователю создавать различные цветовые схемы и для "
-"переключаться между ними. Просто измените цвет и создайте новую схему. "
-"Используется для переключения на белом фоне с соответствующими цветами для "
-"большей наглядности при ярком солнечном свете. См. окно настроек JOSM  и  "
-"\"Настройки Карты\" (странно, но это так :-)"
+"Позволяет пользователю создавать различные цветовые схемы и переключаться "
+"между ними. Просто измените цвет и создайте новую схему. Используется для "
+"переключения на белый фон с соответствующими цветами для большей наглядности "
+"при ярком солнечном свете. См. окно настроек JOSM и \"Настройки Карты"
+"\" (странно, но это так :-)"
 
 #. Plugin Create_grid_of_ways
@@ -15452,5 +15568,5 @@
 msgstr ""
 "Модуль для совмещения изображения с путевыми точками GPX трека. Совмещение "
-"будет произведено, когда аттрибут меток 'name', 'cmt' или 'desc' путевой "
+"будет произведено, когда аттрибут тегов 'name', 'cmt' или 'desc' путевой "
 "точки, будет совпадать с именем файла изображения."
 
@@ -15474,7 +15590,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
-"Открывает диалоговое окно чтобы создать слой для измерения длины и угла "
-"сегментов; области, охваченной простой замкнутой линией;  и создает "
-"измерительный путь (который может быть также импортирован из слоя gps)."
+"Открывает диалоговое окно чтобы создать слой для измерения длины и углов для "
+"линий и полигонов; а также, чтобы создать измерительный путь (который может "
+"быть также импортирован из слоя gps)."
 
 #. Plugin michigan_left
@@ -15577,5 +15693,5 @@
 #: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Показывает окно для редактирования меток в табличной сетке."
+msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
@@ -15586,8 +15702,7 @@
 "the jar-file as standalone as well."
 msgstr ""
-"Добавляет предустановленные метки к меню помощи, которое поможет вам в "
-"разработке предустановленных меток(быстрый просмотр в диалоге, который "
-"появляется во всплывающем окне). Вы можете запустить JAR-файл в автономном "
-"режиме."
+"Добавляет заготовки тегов к меню помощи, которое поможет вам в разработке "
+"заготовок тегов (быстрый просмотр в диалоге, который появляется во "
+"всплывающем окне). Вы можете запустить JAR-файл в автономном режиме."
 
 #. Plugin terracer
@@ -15603,5 +15718,5 @@
 msgstr ""
 "Несколько утилит, которые делают вашу жизнь проще: например, упростить "
-"линию; объединить районы; перейти в позицию."
+"линию; объединить полигоны; перейти в указанную точку."
 
 #. Plugin validator
@@ -15613,5 +15728,5 @@
 "Инспектор OSM данных. Он проверяет наличие проблем в данных, а также "
 "предлагает исправить некоторые известные общие проблемы. Проверяет "
-"правописание имён меток."
+"правописание имён тегов."
 
 #. Plugin walkingpapers
@@ -19030,5 +19145,5 @@
 #: build/trans_presets.java:1513 build/trans_presets.java:1555
 msgid "Area"
-msgstr "Область"
+msgstr "Полигон"
 
 #. item "Public Transport/Railway Platform" check "Area"
@@ -19713,5 +19828,4 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
 msgstr "Место раскопок"
@@ -19720,7 +19834,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #: build/trans_presets.java:1843
-#, fuzzy
 msgid "Edit Palaeontological Site"
-msgstr "Править Место раскопок"
+msgstr "Править место раскопок"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -20417,5 +20530,5 @@
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
-msgstr "плаванье"
+msgstr "плавание"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
@@ -24482,5 +24595,5 @@
 #: build/trans_style.java:886
 msgid "emergency_access_point"
-msgstr "пункт неотложной помощи"
+msgstr "пункт_неотложной_помощи"
 
 #. color water
@@ -27033,5 +27146,5 @@
 #: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "woodarea"
+msgstr "лес"
 
 #. color water
@@ -27510,10 +27623,10 @@
 #: build/trans_validator.java:40
 msgid "oneway tag on a node"
-msgstr "метка oneway на точке"
+msgstr "тег oneway на точке"
 
 #. node : W : oneway == *
 #: build/trans_validator.java:41
 msgid "bridge tag on a node"
-msgstr "метка bridge на точке"
+msgstr "тег bridge на точке"
 
 #. node : W : bridge == BOOLEAN_TRUE
@@ -27526,5 +27639,5 @@
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
-msgstr "неверная метка highway на точке"
+msgstr "неверный тег highway на точке"
 
 #. node : W : highway == track
@@ -27557,10 +27670,10 @@
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
-msgstr "велодорожка с меткой bicycle"
+msgstr "велодорожка с тегом bicycle"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr "пешеходная дорожка с меткой foot"
+msgstr "пешеходная дорожка с тегом foot"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -27587,5 +27700,5 @@
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
-msgstr "метка слоя со знаком +"
+msgstr "тег слоя со знаком +"
 
 #. *    : W : layer == /\+.*/
@@ -27611,5 +27724,5 @@
 #: build/trans_validator.java:79
 msgid "unusual tag combination"
-msgstr "необычная комбинация меток"
+msgstr "необычная комбинация тегов"
 
 #. FORMAT
@@ -27690,77 +27803,343 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Поиск невозможен, так как не загружено никаких данных."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "В этой истории не существует элемента версии {0}"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "более ранняя версия не найдена. История пуста."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "более поздняя версия не найдена. История пуста."
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "Тип не найден. История пуста."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Выделите начальную точку на конце линии"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Достигнут конец линии"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Достигнут перекрёсток"
+
+#~ msgid "help"
+#~ msgstr "Справка"
+
+#~ msgid "Help / About"
+#~ msgstr "Справка / О модуле"
+
+#~ 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 ""
+#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
+#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
+#~ "\n"
+#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
+#~ "следующую схему:\n"
+#~ "wmsplugin.url.1.name=Landsat\n"
+#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
+#~ "\n"
+#~ "Пример входного формата: полный URL WMS (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
+#~ "всё что нужно - ввести соответствующий 'id'.\n"
+#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
+#~ "приведённом примере, заменив 73 на 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"
+#~ "Примечание: Убедитесь что использование изображения легально, если в этом "
+#~ "есть хоть какие-то сомнения - не используйте его."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Справка по модулю WMS"
+
+#~ msgid "No data imported."
+#~ msgstr "Данные не импортированы"
+
 #~ msgid "File could not be found."
 #~ msgstr "Файл не найден"
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Выберите хотя бы один тип данных для скачивания."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Ошибка загрузки в OSM API"
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестное расширение файла."
+
+#~ msgid "Email"
+#~ msgstr "Электронная почта"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Несохранённые изменения"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Соединение с OSM сервером..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Неизвестная версия"
+
+#~ msgid "position"
+#~ msgstr "положение"
+
+#~ msgid "different"
+#~ msgstr "различный"
+
+#~ msgid "true"
+#~ msgstr "истина"
+
+#~ msgid "false"
+#~ msgstr "ложь"
+
+#~ msgid "Change"
+#~ msgstr "Изменить"
+
+#~ msgid "unnamed"
+#~ msgstr "безымянный"
+
+#~ msgid "Move"
+#~ msgstr "Переместить"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "У выделенных линий различается участие в отношениях. Всё равно хотите их "
+#~ "объединить?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Все линии были пустыми"
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Конфликтующее отношение"
 
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли "
-#~ "{2}.<br>Удалить из отношения?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\"."
-#~ "<br>Удалить из отношения?</html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Ошибка разбора"
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Ошибка при загрузке страницы {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Открыть в браузере"
+
+#~ msgid "Rotate"
+#~ msgstr "Вращать"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Удалить {1} {0}"
+
+#~ msgid "my version:"
+#~ msgstr "моя версия:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} объект имеет конфликты."
+#~ msgstr[1] "{0} объекта имеет конфликты."
+#~ msgstr[2] "{0} объектов имеет конфликты."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Разрешить конфликты"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Разрешение конфликтов."
+
+#~ msgid "their version:"
+#~ msgstr "их версия:"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Нажмите \"Обновить\" для обновления списка"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Object"
+#~ msgstr "Объект"
+
+#~ msgid "Revert"
+#~ msgstr "Откатить"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Тэги (пустое значение удаляет тэг)"
+
+#~ msgid "name"
+#~ msgstr "название"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Невозможно связаться с сервером."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "При импортировании возникли конфликтные ситуации."
 
 #~ msgid "File not found"
 #~ msgstr "Файл не найден"
 
-#~ msgid "Replace"
-#~ msgstr "Заменить"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Заменить линию этим участником, связанным с объединённой линией"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Пожалуйста, введите сначала желаемые координаты"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Сначала выберите закладку"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Задайте строку для поиска"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Не удается получить результаты поиска"
-
-#~ msgid "name"
-#~ msgstr "название"
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Найден элемент <nd> вне пути."
+
+#~ msgid "Commit comment"
+#~ msgstr "Комментарий правки"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
+#~ "повторите попытку позже."
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
+
+#~ msgid "Station"
+#~ msgstr "Станция"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Обновить список выбранного."
+
+#~ msgid "Occupied By"
+#~ msgstr "Объект"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Использовать шаблон ''{0}''"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
+#~ "создайте отчёт об ошибке."
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Выделенные точки участвуют в различных отношениях. Всё равно хотите "
+#~ "объединить?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Объединить точки из разных отношений?"
+
+#~ msgid "resolved version:"
+#~ msgstr "Разрешённая версия:"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Откатить состояние выбранных объектов до версии, указанной в списке "
+#~ "правок."
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Ошибка при скачивании модуля: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Модуль уже существует"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Некоторые точки - (почти) на одной линии"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Выбрана только одна точка"
+
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr ""
+#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
+#~ "функции."
 
 #~ msgid "zoom"
 #~ msgstr "масштаб"
 
-#~ msgid "Copy defaults"
-#~ msgstr "Копировать умолчания"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Пожалуйста, выберите ряд для копирования."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgid "Validate"
+#~ msgstr "Проверить"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Подстроить положение слоя WMS"
+
+#~ msgid "Navigation"
+#~ msgstr "Навигация"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Подъёмный мост"
+
+#~ msgid "Edit Station"
+#~ msgstr "Править станцию"
+
+#~ msgid "citymap"
+#~ msgstr "карта города"
+
+#~ msgid "hikingmap"
+#~ msgstr "карта туристических маршрутов"
+
+#~ msgid "map"
+#~ msgstr "карта"
+
+#~ msgid "bicyclemap"
+#~ msgstr "карта велодорожек"
+
+#~ msgid "board"
+#~ msgstr "доска информации"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "подложка Geofabrik.de"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} "
-#~ "шт.."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Добавить новый XML источник к списку."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr ""
-#~ "Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)"
+#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Сервер не поддерживает управление версиями"
 
 #~ msgid ""
@@ -27770,265 +28149,4 @@
 #~ "(Можно указать, с каким промежутком в днях будет появляться<br>данное "
 #~ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)"
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. "
-#~ "Геометрия приведена к состоянию по умолчанию. Детали: {1}"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Показать статус квадрата карты"
-
-#~ msgid "Request Update"
-#~ msgstr "Запросить обновление"
-
-#~ msgid "error loading metadata"
-#~ msgstr "ошибка загрузки метаданных"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "ошибка запроса обновления: уровень масштабирования не 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "предлагается: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "ошибка при запросе обновления"
-
-#~ msgid "No data imported."
-#~ msgstr "Данные не импортированы"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестное расширение файла."
-
-#~ msgid "Email"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Несохранённые изменения"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Соединение с OSM сервером..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестная версия"
-
-#~ msgid "position"
-#~ msgstr "положение"
-
-#~ msgid "different"
-#~ msgstr "различный"
-
-#~ msgid "true"
-#~ msgstr "истина"
-
-#~ msgid "false"
-#~ msgstr "ложь"
-
-#~ msgid "Change"
-#~ msgstr "Изменить"
-
-#~ msgid "unnamed"
-#~ msgstr "безымянный"
-
-#~ msgid "Move"
-#~ msgstr "Переместить"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "У выделенных линий различается участие в отношениях. Всё равно хотите их "
-#~ "объединить?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Все линии были пустыми"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Ошибка при загрузке страницы {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Открыть в браузере"
-
-#~ msgid "Rotate"
-#~ msgstr "Вращать"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Удалить {1} {0}"
-
-#~ msgid "my version:"
-#~ msgstr "моя версия:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} объект имеет конфликты."
-#~ msgstr[1] "{0} объекта имеет конфликты."
-#~ msgstr[2] "{0} объектов имеет конфликты."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Разрешить конфликты"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Разрешение конфликтов."
-
-#~ msgid "their version:"
-#~ msgstr "их версия:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#~ msgid "Date"
-#~ msgstr "Дата"
-
-#~ msgid "Object"
-#~ msgstr "Объект"
-
-#~ msgid "Revert"
-#~ msgstr "Откатить"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Тэги (пустое значение удаляет тэг)"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Невозможно связаться с сервером."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "При импортировании возникли конфликтные ситуации."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Найден элемент <nd> вне пути."
-
-#~ msgid "Commit comment"
-#~ msgstr "Комментарий правки"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
-#~ "повторите попытку позже."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
-
-#~ msgid "Station"
-#~ msgstr "Станция"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Обновить список выбранного."
-
-#~ msgid "Occupied By"
-#~ msgstr "Объект"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Использовать шаблон ''{0}''"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
-#~ "создайте отчёт об ошибке."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Выделенные точки участвуют в различных отношениях. Всё равно хотите "
-#~ "объединить?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Объединить точки из разных отношений?"
-
-#~ msgid "resolved version:"
-#~ msgstr "Разрешённая версия:"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Откатить состояние выбранных объектов до версии, указанной в списке "
-#~ "правок."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Ошибка при скачивании модуля: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Модуль уже существует"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Некоторые точки - (почти) на одной линии"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Выбрана только одна точка"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
-#~ "функции."
-
-#~ msgid "Validate"
-#~ msgstr "Проверить"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Подстроить положение слоя WMS"
-
-#~ msgid "Navigation"
-#~ msgstr "Навигация"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Подъёмный мост"
-
-#~ msgid "Edit Station"
-#~ msgstr "Править станцию"
-
-#~ msgid "citymap"
-#~ msgstr "карта города"
-
-#~ msgid "hikingmap"
-#~ msgstr "карта туристических маршрутов"
-
-#~ msgid "map"
-#~ msgstr "карта"
-
-#~ msgid "bicyclemap"
-#~ msgstr "карта велодорожек"
-
-#~ msgid "board"
-#~ msgstr "доска информации"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "подложка Geofabrik.de"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Сервер не поддерживает управление версиями"
 
 #~ msgid "Really mark this issue as ''done''?"
@@ -28107,4 +28225,10 @@
 #~ msgstr "Online-справка по JOSM"
 
+#~ msgid "Error while parsing"
+#~ msgstr "Ошибка разбора"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Пожалуйста, введите сначала желаемые координаты"
+
 #~ msgid "OSM username (email)"
 #~ msgstr "Имя пользователя OSM (e-mail)"
@@ -28113,4 +28237,7 @@
 #~ msgstr "Ошибка при разборе ответа от сервера."
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Задайте строку для поиска"
+
 #~ msgid "<nd> has zero ref"
 #~ msgstr "у <nd> нет ссылок ref"
@@ -28136,4 +28263,10 @@
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Не удается прочитать каталог с настройками: {0}"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Не удается получить результаты поиска"
+
+#~ msgid "error loading metadata"
+#~ msgstr "ошибка загрузки метаданных"
 
 #~ msgid "Please choose a user using the author panel"
@@ -28182,4 +28315,10 @@
 #~ msgstr "Публичный"
 
+#~ msgid "Request Update"
+#~ msgstr "Запросить обновление"
+
+#~ msgid "error requesting update"
+#~ msgstr "ошибка при запросе обновления"
+
 #~ msgid ""
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
@@ -28191,4 +28330,7 @@
 #~ msgid "Open User Page"
 #~ msgstr "Открыть страницу пользователя"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Пожалуйста, выберите ряд для копирования."
 
 #~ msgid "YAHOO (WebKit GTK)"
@@ -28296,4 +28438,7 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Удалить узлы маршрутизации"
+
+#~ msgid "requested: {0}"
+#~ msgstr "предлагается: {0}"
 
 #~ msgid "Continue anyway"
@@ -28538,4 +28683,10 @@
 #~ msgstr "Конфликт создан"
 
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Добавить новый XML источник к списку."
+
+#~ msgid "Copy defaults"
+#~ msgstr "Копировать умолчания"
+
 #~ msgid ""
 #~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
@@ -28555,4 +28706,7 @@
 #~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. "
 #~ "Исключение в: {0}"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Сначала выберите закладку"
 
 #~ msgid ""
@@ -28604,4 +28758,7 @@
 #~ msgstr "Использовать текущий список изменений {0} и оставить открытым"
 
+#~ msgid "Replace"
+#~ msgstr "Заменить"
+
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''"
@@ -28659,6 +28816,12 @@
 #~ msgstr "Скачать зависимости с OSM..."
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Выберите хотя бы один тип данных для скачивания."
+
 #~ msgid "Download referrers..."
 #~ msgstr "Скачать зависимости..."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Ошибка загрузки в OSM API"
 
 #~ msgid ""
@@ -28707,6 +28870,31 @@
 #~ msgstr "Середина линии: {0}"
 
+#~ msgid "Show Tile Status"
+#~ msgstr "Показать статус квадрата карты"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Заменить линию этим участником, связанным с объединённой линией"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. "
+#~ "Геометрия приведена к состоянию по умолчанию. Детали: {1}"
+
 #~ msgid "Processing {0}"
 #~ msgstr "Обработка {0}"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "ошибка запроса обновления: уровень масштабирования не 12"
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr ""
+#~ "Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr ""
+#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} "
+#~ "шт.."
 
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
@@ -28733,4 +28921,18 @@
 #~ "check the servers address ''{1}'' for typos."
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\"."
+#~ "<br>Удалить из отношения?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли "
+#~ "{2}.<br>Удалить из отношения?</html>"
+
 #~ msgid "Updates the currently selected primitives from the server"
 #~ msgstr "Обновить выделенные элементы с сервера"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 18508)
+++ applications/editors/josm/i18n/po/sk.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-07 18:37+0000\n"
-"Last-Translator: Martin Petricek <singularita@gmail.com>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-15 18:43+0000\n"
+"Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:08+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 "Chyba"
@@ -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"
@@ -319,5 +320,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
@@ -335,6 +336,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
@@ -345,5 +346,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
@@ -464,5 +465,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
@@ -504,5 +505,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
@@ -511,6 +512,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}'' nesmie byť nulový"
 
-#: ../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 "Boli tam {0} konflikty počas importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikty počas sťahovania"
 
-#: ../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 "({0}/{1}) Nahrávam rodičovské z bodov {2}"
 
-#: ../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 "({0}/{1}) Nahrávam rodičovské z cesty {2}"
 
-#: ../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 "Exportovať do 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 "Exportovať dáta do GPX súboru."
@@ -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 "Pripojiť bod k najbližšej ceste"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Spojiť body a línie"
@@ -1004,21 +1013,19 @@
 msgstr "Zvoľte minimálne dva body pre zlúčenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Prerušujem..."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr "Zrušiť spojovanie"
+
+#: ../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
+msgstr "Kľuknúť pre zrušenie spojovania bodov"
+
+#: ../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 ""
-"Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr "Nemôžem spojiť body: Mám zmazať cestu ''{0}'' ktorá je ešte používaná."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1159,7 +1166,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Sťahujem dáta"
+msgstr "Sťahovanie dát"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1314,10 +1320,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 "Uložiť"
 
 #: ../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 "Uložiť aktuálne dáta."
@@ -1374,10 +1380,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 "Uložiť ako..."
 
 #: ../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 "Uložiť aktuálne údaje do nového súboru."
@@ -1421,25 +1427,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 "Zavrieť"
 
-#: ../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 "Rozdeliť cestu"
 
-#: ../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 "Rozdeliť cestu vo zvolenom bode"
 
-#: ../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 "Tento výber nemôže byť použitý k rozdeleniu."
 
-#: ../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."
@@ -1448,5 +1454,5 @@
 msgstr[2] "Vybraté body nie sú v strede cesty."
 
-#: ../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 "
@@ -1465,9 +1471,9 @@
 "vyberte tiež cestu."
 
-#: ../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 "Zvolené body nezdieľajú rovnakú cestu."
 
-#: ../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."
@@ -1476,10 +1482,10 @@
 msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
 
-#: ../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 "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty."
 
-#: ../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 "
@@ -1489,5 +1495,5 @@
 "cesty.)"
 
-#: ../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 "
@@ -1498,5 +1504,5 @@
 "html>"
 
-#: ../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 "
@@ -1506,5 +1512,5 @@
 "toto overiť a  opraviť ak je to nutné.</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"
@@ -1534,38 +1540,38 @@
 msgstr "Zduplikovať body používané viacerými cestami."
 
-#: ../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 "Tento bod nie je prilepený k ničomu inému."
 
-#: ../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 "Žiaden z týchto bodov nie je prilepený k ničomu inému."
 
-#: ../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 "Žiadna z týchto ciest nie je prilepená k ničomu inému."
 
-#: ../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 "Tento výber sa nedá použiť pre oddelenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden označený bod, alebo"
 
-#: ../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 "* Jeden bod používaný viac než jednou cestou, alebo"
 
-#: ../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 ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
 
-#: ../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"
@@ -1574,5 +1580,5 @@
 "ceste, alebo"
 
-#: ../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."
@@ -1581,5 +1587,5 @@
 "ceste."
 
-#: ../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"
@@ -1592,9 +1598,9 @@
 "svoje vlastné kópie a všetky bodybudú vybraté."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nepripojený bod (Unglued Node)"
 
-#: ../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"
@@ -1602,5 +1608,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"
@@ -1641,12 +1647,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Aktualizovať objekty v aktuálnej dátovej vrstvy zo servera."
+msgstr "Aktualizácia objektov v aktívnej dátovej vrstve zo servera."
 
 #. 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 "Sťahujem dáta"
@@ -1662,5 +1667,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Aktualizovať výbery"
 
@@ -1675,5 +1681,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu."
 
@@ -1681,4 +1688,9 @@
 msgid "Selection empty"
 msgstr "Výber je prázdny"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Zmazať objekty"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1688,7 +1700,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 "Nahrať všetky zmeny v aktuálnej dátovej vrstve na OSM server"
+msgstr "Nahrať všetky zmeny v aktívnej dátovej vrstve na OSM server"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1834,28 +1845,27 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: object ''{0}'' is already deleted on the server. Skipping this "
 "object and retrying to upload."
 msgstr ""
-"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
-"pôvodných a zopakovanie nahratia."
+"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento "
+"objekt a opakujem nahrávanie."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
-#, fuzzy, java-format
+#, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
-"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
-"pôvodných a zopakovanie nahratia."
+msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Nahrávam dáta ..."
+msgstr "Nahrávam {0} objekty(ov) ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
+msgstr ""
+"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
@@ -1972,9 +1982,9 @@
 msgstr "Stiahnuté GPX dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Sťahujem dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1982,5 +1992,5 @@
 msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
 
-#: ../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 "V tejto oblasti sa nenachádzajú žiadne dáta."
@@ -1996,16 +2006,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "viditeľné (na servery)"
+msgstr "Kontrova na servery"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-#, fuzzy
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
 msgstr ""
-"{0} objekt bol očistený z lokálneho dátového súboru, pretože je zmazaný na "
-"servery."
+"Kľuknúť pre kontrolu či objekty vo vašej lokálnej dátovej sade sú zmazané na "
+"servery"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2015,7 +2023,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "Kľuknutím zrušíte a pokračujete v editovaní mapy"
+msgstr "Kľuknúť pre zrušenie a obnovenie editovania"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2039,7 +2046,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}"
+msgstr "Nasledujúce chyby nastali počas hromadného sťahovania: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2049,7 +2056,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Chyby v priebehu sťahovania"
+msgstr "Chyby počas sťahovania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2063,5 +2069,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
@@ -2094,6 +2100,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 "zvolené"
@@ -2111,26 +2117,26 @@
 msgstr "Pridať bod do cesty"
 
-#: ../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 "Pripojiť existujúcu cestu do bodu"
 
-#: ../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 "Pridať nový bod do existujúcej cesty"
 
-#: ../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 "Pridať bod do cesty a spojiť"
 
-#: ../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 "Vytvoriť nový bod."
 
-#: ../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 "Zvoliť bod pod kurzorom."
 
-#: ../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."
@@ -2140,47 +2146,46 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../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 "Začiatok novej cesty z posledného bodu."
 
-#: ../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 "Pokračovanie cesty z posledného bodu."
 
-#: ../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 "Koniec kreslenia."
 
-#: ../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 "Vyťiahnuť (extrude)"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Vytvoriť plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Vyťiahnuť cestu"
 
-#: ../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 "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši."
 
-#: ../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 "Pustite tlačítko myši k zastaveniu otáčania"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Ťahajte segment cesty na vytvorenie pravouholníka."
 
@@ -2240,4 +2245,8 @@
 msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2245,4 +2254,8 @@
 msgstr ""
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Pustite tlačítko myši k zastaveniu otáčania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2272,69 +2285,72 @@
 "hore dolu doľava doprava; pohyb so zväčšením možno tiež pravým tlačítkom myši"
 
-#: ../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 "Vyhľadávať..."
 
-#: ../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 "Vyhľadávať objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
-
-#: ../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 "Prosím vložte vybraný reťazec"
 
-#: ../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 "Zadajte hladaný reťazec."
 
-#: ../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 "regulárny výraz"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "nahradiť označené"
 
-#: ../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 "pridať k výberu"
 
-#: ../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 "odobrať z výberu"
 
-#: ../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 "Hľadať vo výbere"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "veľkosť písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regulárny výraz"
 
-#: ../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>Baker Street</b> - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene."
 
-#: ../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>\"Baker Street\"</b> - 'Baker Street' v akomkoľvek kľúči, alebo mene."
 
-#: ../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:Bak</b> - 'Bak' kdekoľvek v mene."
 
-#: ../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=cesta</b> - kľúč 'type' s presnou hodnotou 'cesta'."
 
-#: ../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>, "
@@ -2344,17 +2360,17 @@
 "b>, <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:Bak</b> - neobsahuje 'Bak' v mene."
 
-#: ../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> - klúč 'foot' nastavený na akúkoľvek hodnotu."
 
-#: ../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>Špeciálne ciele:</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>)"
@@ -2363,45 +2379,46 @@
 "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>user:</b>... - všetky objekty nahraté užívateľom"
 
-#: ../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 "<b>id:</b>... - objekt s určeným ID (0 pre nové objekty)"
 
-#: ../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>... - objekt s pridanými číslami bodov"
 
-#: ../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>... - objekt s pridanými číslami bodov"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgstr ""
+"<b>značky:</b>... - objekt s uvedeným číslom kvôli značkám (značky:spočítať "
+"alebo značky:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všetky zmenené objekty"
 
-#: ../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> - všetky vybraté objekty"
 
-#: ../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> - všetky nekompletné objekty"
 
-#: ../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>untagged</b> - všetky neoznačené objekty"
 
-#: ../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 "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
 
-#: ../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"
@@ -2409,17 +2426,17 @@
 "<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
 
-#: ../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 "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
 
-#: ../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 "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
 
-#: ../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 "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
 
-#: ../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
@@ -2429,51 +2446,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 "Hľadať"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr "Predložiť filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Začať vyhľadávanie"
 
-#: ../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 "Neboli nájdené záznamy pre \"{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 "Nič nebolo pridané do výberu hľadaním \"{0}\""
 
-#: ../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 "Nič nebolo odstránené z výberu hľadaním \"{0}\""
 
-#: ../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 "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''"
 
-#: ../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 "Najdených {0} zodpovedajúcich výrazov"
 
-#: ../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"
@@ -2525,16 +2542,15 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Zlé číslo parametrov pre operátor bodov."
+msgstr "Zlý počet údajov(parametrov) pre operátor značiek."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"Nesprávna hodnota operátora bodov: {0}. Operátor bodov čaká čísla bodov, "
-"alebo rozsah bodov, napr. body:10-20"
+"Nesprávna hodnota z operátora značiek: {0}. Operátor značiek očakáva číslo "
+"zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2659,6 +2675,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
@@ -2788,5 +2804,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 ""
@@ -2809,9 +2825,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}'' nemôže byť prázdny"
+msgstr "Údaj(parameter) ''{0}'' nesmie byť prázdny"
 
 #: ../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"
@@ -2851,5 +2870,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 "Rozdeliť segment cesty"
@@ -2857,6 +2876,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."
@@ -2868,5 +2887,5 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr "Odstrániť potvrdenie"
@@ -2877,5 +2896,15 @@
 msgstr "Vyriešte konflikty v zmazaných (state) v {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"
@@ -2961,5 +2990,5 @@
 msgstr "Vyriešiť {0} konfliktné značky v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -3066,8 +3095,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 "Nedovolená zdvojená hodnota ''{0}''"
+
+#: ../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 "Východzia hodnota je''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3164,5 +3199,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3171,4 +3206,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v súbore "
+"záložiek ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -3189,5 +3226,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
+msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
@@ -3197,4 +3234,6 @@
 "server"
 msgstr ""
+"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v obsahu "
+"záložiek zo servera"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
@@ -3208,9 +3247,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Neúspešné nahratie záložiek z ''{0}'' pre bezpečnostné dôvody. Výnimka bola: "
-"{1}"
+msgstr "Nesprávne načítanie čítacieho prostriedku ''{0}''. Chyba je {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3224,8 +3261,10 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Varovanie: neočakávané číslo verzie JOSM v opravnom(revision) súbore, "
+"hodnota je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Varovanie: opravný súbor ''/REVISION'' chýba."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
@@ -3269,5 +3308,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
@@ -3279,7 +3318,7 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it's already included"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3288,4 +3327,43 @@
 "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 "Chýbajúci argument pre \"NOT\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, fuzzy, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "História pre reláciu {0}"
+
+#: ../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
+#, fuzzy, 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 ""
+"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v "
+"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. "
+"Zostávajú moje pôvodné. "
 
 #. translators notes must be in front
@@ -3342,33 +3420,34 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Chyba: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varovanie: {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 "očekávané id >= 0. Got {0}"
 
-#: ../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 "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../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 "ID > 0 očakávané. Got {0}"
 
-#: ../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 "verzia > 0 očakávaná. Got {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3394,45 +3473,28 @@
 "viacnásobnými hodnotami"
 
-#: ../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 "nemôžem pridať bod {0} do nedokončenej cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii"
-
-#: ../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 "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
-
-#: ../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} > 0 požadovaný. Dostal {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "nenájdená predchádzajúca verzia. História je prázdna."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "nenájdená staršia verzia. História je prázdna."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr "Typ nenájdený. História(priebeh) je prázdna."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
-
-#: ../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 "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade"
-
-#: ../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
@@ -3443,6 +3505,7 @@
 msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
 
@@ -3453,148 +3516,145 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../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 "Cesta označená ako plocha nie je uzavretá."
 
-#: ../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 "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../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 "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../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 "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../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 "Najdená viac než jedna \"from\" cesta."
 
-#: ../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 "Najdené viac cieľových \"to\" ciest."
 
-#: ../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 "Viac ako jedna \"via\" najdená."
 
-#: ../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 "Neznáma funkcia ''{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 "Neznámy typ člena pre ''{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 "Nenajdená cesta \"from\"."
 
-#: ../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 "Nenajdená cesta \"to\"."
 
-#: ../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 "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../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 "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../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 "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../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 "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../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 "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../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 "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#: ../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 "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#: ../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 "Neplatná funkcia ''{0}'' pre Cestu ''{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 "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../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 "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../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 "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../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 "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../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 "neoznačený"
 
-#: ../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 "text"
 
-#: ../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 "oblasť textu"
 
-#. 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 ""
-"Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v "
-"nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto nezrovnalosťou. "
-"Zostávajú moje pôvodné. "
-
-#: ../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 "Chyba: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varovanie: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "neaktívny"
 
-#: ../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
@@ -3605,5 +3665,5 @@
 msgstr[2] "bodov"
 
-#: ../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
@@ -3614,6 +3674,6 @@
 msgstr[2] "ciest"
 
-#: ../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
@@ -3624,13 +3684,13 @@
 msgstr[2] "vzťahov (relations)"
 
-#: ../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 "neoznačená cesta"
 
-#: ../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 "nekompletná cesta"
 
-#: ../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
@@ -3638,5 +3698,5 @@
 msgstr "pozadie"
 
-#: ../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 "označiť (highlight)"
@@ -3720,5 +3780,5 @@
 msgstr "Nezobrazovať v budúcnosti"
 
-#: ../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
@@ -3726,32 +3786,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 "neúplný"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "komunikácie"
 
-#: ../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 "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vodný tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
 
-#: ../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"
@@ -3761,5 +3821,5 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3769,33 +3829,33 @@
 msgstr[2] "{0} členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Predpokladaný priestupok"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr "Bezpečnostná výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr "Sieťová výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr "IO Výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr "Vnútorná chyba servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr "Chybná požiadavka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr "Nenájdené"
 
-#: ../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
@@ -3803,9 +3863,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Neznámy hostiteľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr "Objekt je vymazaný"
@@ -3827,7 +3887,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Zavrieť dialógové okno"
+msgstr "Kľuknutím zavriete dialóg"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4030,5 +4089,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 "Upraviť"
@@ -4156,10 +4215,10 @@
 msgstr "Používateľ:"
 
-#: ../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 "vrstva nie je v zozname"
 
-#: ../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"
@@ -4167,7 +4226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Nie, zrušiť operáciu"
+msgstr "Kľuknutím zrušíte aktuálnu operáciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4296,5 +4354,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"
@@ -4303,5 +4361,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"
@@ -4311,5 +4369,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 "Členovia"
@@ -4771,5 +4829,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 "Nie, zrušiť"
@@ -4833,6 +4891,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 "<nedefinované>"
@@ -4935,7 +4991,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Konflikty pri spojovaní bodov - spojovaný bod je ''{0}''"
+msgstr "Konflikty pri spájaní bodov - cieľový bod je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
@@ -4961,4 +5017,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"
@@ -5057,5 +5114,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"
@@ -5067,5 +5124,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"
@@ -5085,12 +5142,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Ponechať zdroj"
+msgstr "Ponechať"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
-#, fuzzy
 msgid "Keep this relation member for the target object"
-msgstr "Odstrániť tohoto člena relácie z relácie"
+msgstr "Ponechať tohto člena relácie pre cieľový objekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
@@ -5109,12 +5164,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Nastavenie funkcie pre vybrané členy"
+msgstr "Vložiť funkcie pre všetkých členov relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
-#, fuzzy
 msgid "Tag modified relations with "
-msgstr "Značka zmenená vzťahmi s   "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5123,4 +5176,6 @@
 "modified relations.</html>"
 msgstr ""
+"<html>Výber umožní zanesenie značky, ktorá bude používaná<br>do všetkých "
+"zmenených relácií.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5130,7 +5185,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
+msgstr "<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5142,4 +5196,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola členov</tt></strong></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5199,5 +5255,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
@@ -5300,5 +5356,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"
@@ -5354,11 +5410,11 @@
 msgstr "Zobraziť históriu všetkých zobrazených objektov"
 
-#: ../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 "Objekt s históriou(priebehom)"
 
-#: ../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
@@ -5366,13 +5422,13 @@
 msgstr "Znovu načítať"
 
-#: ../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 "Znovu nahrať vybrané objekty a obnoviť zoznam."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr "Ukázať"
 
-#: ../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 "Zobraziť históriu(priebeh) vybraných objektov."
@@ -5429,7 +5485,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] "Toto zmení až {0} objektov."
@@ -5438,5 +5493,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 "Prázdna hodnota zmaže klúče"
 
@@ -5462,4 +5518,12 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
+#: ../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] "Toto zmení až {0} objektov."
+msgstr[1] "Toto zmení až {0} objekt."
+msgstr[2] "Toto zmení až {0} objekty."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5536,58 +5600,54 @@
 #. 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 "Relácie"
 
-#: ../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 "Otvoríť zoznam všetkých relácií"
 
-#: ../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 "Relácie: {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 "Otvoriť editor pre zvolenú reláciu"
 
-#: ../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 "Zmazať vybraté relácie"
 
-#: ../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 "Vytvoriť novú reláciu"
 
-#: ../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 "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
-#: ../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 "Pridať aktuálny výber do zoznamu vybratých relácií"
 
-#: ../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 "Zmazať vybraté relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
-#, fuzzy
+msgstr "Výber členov zo všetkých vybraných relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
 msgid "Select members"
-msgstr "Vyberte buď:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
-#, fuzzy
+msgstr "Výber členov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
-msgstr "Nahrať vybraté relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
-#, fuzzy
+msgstr "Stiahnutie všetkých členov z vybraných relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
 msgstr "Stiahnuť členov"
@@ -5752,5 +5812,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}"
@@ -6012,18 +6072,19 @@
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
 
-#: ../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 "Zväčšiť na"
 
-#: ../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"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#, fuzzy
+msgid "Zoom to the object the first selected member refers to"
 msgstr "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna"
 
-#: ../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 "Zväčšovanie je vypnuté pretože nie je vybratý člen"
@@ -6046,5 +6107,5 @@
 msgstr "child.getId() >0 očakávaný. Got {1}"
 
-#: ../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}"
@@ -6117,7 +6178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
-#, fuzzy
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "Teraz tam nie je otvorený súbor zmien."
+msgstr "<html>Nie je vybraná oblasť pre stiahnutie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
@@ -6127,14 +6187,14 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
+"<html><strong>Aktuálne sťahovaná oblasť</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Vytvorte rozhranie(hranice)"
+msgstr "Vytvoriť záložku"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Načítať aktuálne vybranú reláciu"
+msgstr "Pridať záložku pre aktuálne výbranú sťahovanú oblasť"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -6142,10 +6202,11 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"Aktuálne, nie je vybraná žiadna sťahovaná oblasť. Prosím vyberte najskôr "
+"oblasť."
 
 #: ../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 "Prosím zadajte meno pre umiestnenie."
+msgstr "Prosím zvoľte názov pre záložku zo sťahovanej oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -6155,12 +6216,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Pridať všetky zvolené objekty medzi členy"
+msgstr "Vymazať vybraté záložky"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Pridať všetky zvolené objekty medzi členy"
+msgstr "Premenovať vybratú záložku"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6196,17 +6255,17 @@
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
-msgstr ""
+msgstr "Reťazec ''{0}'' nie je platný, zdvojená hodnota."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Hodnota pre zemepisnú šírku v rozsahu [-90,90] povinná."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Hodnota pre zemepisnú dížku v rozsahu [-180,180] povinná."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "Vložiť URL zo schránky"
 
 #. adding the download tasks
@@ -6220,7 +6279,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Rozdeliť cestu vo zvolenom bode"
+msgstr "Výber pre stiahnutie OSM dát vo vybratej sťahovanej oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6229,7 +6287,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Označená cesta neobsahuje vybratý bod."
+msgstr "Výber pre stiahnutie GPS stôp(traces) vo vybratej sťahovanej oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6253,7 +6310,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Nie je vybraná žiadna relácia"
+msgstr "Žiadna oblasť nie je vybratá"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6267,17 +6323,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Kľuknutie zavrie dialóg a zruší vymazanie objektov"
+msgstr "Kľuknutím zavriete dialóg a prerušíte sťahovanie"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Načítať aktuálne vybranú reláciu"
+msgstr "Kľuknutím stiahnete aktuálne vybratú oblasť"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Prosím vyberte riadok na úpravu."
+msgstr "Prosím vyberte najskôr sťahovanú oblasť"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6287,4 +6340,7 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je umožnený."
+"<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
@@ -6293,11 +6349,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Zapíšte názov miesta pre vyhľadávanie:"
+msgstr "Vložte názov miesta pre hľadanie"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
 msgid "Areas around places"
-msgstr ""
+msgstr "Oblasť okolo miesta"
 
 #. SAXException does not chain correctly
@@ -6307,20 +6362,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Vyhľadávať..."
+msgstr "Hľadám ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Smer hľadania zeme"
+msgstr "Kľuknutím sa spustí hľadanie pre miesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
 msgid "Querying name server"
-msgstr ""
+msgstr "Pýtam sa na meno servera"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Pýtam sa na meno servera ..."
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7242,7 +7295,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "blízko"
+msgstr "Blízko"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7284,5 +7336,5 @@
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
+msgstr "Neúspešné načítanie CSS súboru ''help-browser.css''. Výnimka je: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
@@ -7290,5 +7342,5 @@
 msgstr "JOSM Help Browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7302,5 +7354,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 ""
@@ -7311,5 +7363,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 ""
@@ -7318,19 +7370,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 ""
+msgstr "Neúspešné otvorenie URL"
 
 #. 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 "Otvoriť aktuálnu stránku pomoci v externom prehliadači"
 
 #. 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 "Upraviť aktuálnu stránku pomoci"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7340,42 +7392,43 @@
 
 #. 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 "Preložiť aktuálnu stránku pomoci"
 
 #. 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 "Prejsť na predchádzajúcu stránku"
 
 #. 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 "Prejsť na nasledujúcu stránku"
 
 #. 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
+msgstr "Choďte na JOSM domácu stránku pomoci"
+
+#: ../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
+msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: "
+
+#: ../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
+msgstr "Neúspešné otvorenie stránky s pomocou. Cieľová URL je prázdna."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526
 msgid "Failed to open help page"
-msgstr ""
+msgstr "Neúspešné otvorenie stránky s pomocou"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
 msgid "Failed to read command. Exiting help browser. Exception was:"
 msgstr ""
+"Neúspešné načítanie príkazu. Ukončujem prehliadač pre pomoc. Výnimka bola:"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
 msgid "Failed to launch the external help browser"
-msgstr ""
+msgstr "Neúspešné spustenie externého prehliadača pre pomoc"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
@@ -7387,38 +7440,38 @@
 msgstr "Zemepisná dĺžka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr "Súradnice"
 
-#: ../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 "História pre bod {0}"
 
-#: ../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 "História pre cestu {0}"
 
-#: ../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 "História pre reláciu {0}"
 
-#: ../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 "Zavrieť dialógové okno"
 
-#: ../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 "Načítať históriu zo serveru"
 
-#: ../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 ""
 "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
 
-#: ../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 ""
@@ -7427,5 +7480,5 @@
 "Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7433,9 +7486,9 @@
 msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
 
-#: ../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 "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7444,24 +7497,34 @@
 msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr "Nahrať priebeh"
 
-#: ../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} > 0 požadovaný. Dostal {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
+
+#: ../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 "Nahrať históriu pre bod {0}"
 
-#: ../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 "Nahrať históriu pre cestu {0}"
 
-#: ../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}"
@@ -7474,4 +7537,22 @@
 msgstr "Bod {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Priblížiť na problém"
+
+#: ../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 "Nahrať priebeh"
+
+#: ../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
@@ -7484,13 +7565,59 @@
 msgstr "Relácia {0}"
 
-#: ../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 "Menu Sort presets"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Užívateľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr "Zmenový súbor"
 
-#: ../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 "neznámy"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
 #, java-format
 msgid ""
@@ -7498,4 +7625,9 @@
 msgstr ""
 "<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "<anonymné>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7520,4 +7652,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "Verzia {0} vytvorená na {1} podľa {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "zmazané"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "Verzia {0} vytvorená na {1} podľa {2}"
 
@@ -7860,5 +8007,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
 msgid "Decide how to upload the data and which changeset to use"
-msgstr ""
+msgstr "Rozhodnite sa ako nahrať dáta a ktoré zmenové dáta použiť"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
@@ -7894,10 +8041,10 @@
 
 #: ../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] "{0} upravený objekt:"
-msgstr[1] "{0} upravené objekty:"
-msgstr[2] "{0} upravených objektov:"
+msgstr[0] "{0} objekt na úpravy:"
+msgstr[1] "{0} objekty na úpravy:"
+msgstr[2] "{0} objektov na úpravy:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7980,13 +8127,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 "Nahrať obsah z vašich otvorených zmenových súborov zo servera"
 
-#: ../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 "Zatvoriť práve vybratý otvorený zmenový súbor"
 
-#: ../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
@@ -8059,5 +8206,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}..."
@@ -8069,5 +8216,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 "Obrázky s GPS súradnicami"
@@ -8093,5 +8240,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"
@@ -8147,43 +8294,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 poloha bodu"
 
 #: ../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 "Prispôsobiť kresliacu trasu"
 
 #: ../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 "Použíť globálne nastavenie."
 
 #: ../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 "Kresliť spojnice medzi bodmi v tejto vrstve"
 
 #: ../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 "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
 #: ../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 "Výber nastavenia kreslenej čiary"
 
 #: ../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 "Prispôsobiť farbu"
 
 #: ../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"
@@ -8191,6 +8338,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"
@@ -8283,10 +8430,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../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 "Konvertovať do dátovej vrstvy"
 
-#: ../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."
@@ -8296,43 +8443,43 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../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 "Prevedené z: {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 "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../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 "Stiahnuť všetko vo vnútry:"
 
-#: ../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} metrov"
 
-#: ../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 "Maximálna plocha na požiadavku:"
 
-#: ../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} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8343,9 +8490,9 @@
 "<br>Chcete pokračovať?</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 "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../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 "
@@ -8355,5 +8502,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../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 "
@@ -8390,5 +8537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
@@ -8399,15 +8546,8 @@
 "server."
 msgstr[0] ""
-"{0} objekt bol očistený z lokálneho dátového súboru, pretože je zmazaný na "
-"servery."
 msgstr[1] ""
-"{0} objekty boli očistené z lokálneho dátového súboru, pretože sú zmazané na "
-"servery."
-msgstr[2] ""
-"{0} objektov bolo očistených z lokálneho dátového súboru, pretože sú zmazané "
-"na servery."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
@@ -8416,43 +8556,41 @@
 "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
 "Dialog and manually resolve them."
-msgstr[0] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
-msgstr[1] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
-msgstr[2] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
-
-#: ../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 "Kľuknutím zavriete tento dialóga pokračujete v editovaní"
+
+#: ../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} zmazané.)"
-msgstr[1] " ({0} zmazané.)"
-msgstr[2] " ({0} zmazané.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] "{0} vymazaný"
+msgstr[1] "{0} vymazané"
+msgstr[2] "{0} vymazaných"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../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 "Verzia API: {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 "Previesť do GPX vrstvy"
 
-#: ../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."
@@ -8462,5 +8600,5 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8470,5 +8608,5 @@
 msgstr[2] "stopy"
 
-#: ../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"
@@ -8477,5 +8615,5 @@
 msgstr[2] "bodov"
 
-#: ../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"
@@ -8485,5 +8623,5 @@
 msgstr[2] "stopy s {0} bodmi"
 
-#: ../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"
@@ -8493,5 +8631,5 @@
 msgstr[2] "{0} skladá sa z {1} stôp"
 
-#: ../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"
@@ -8501,9 +8639,9 @@
 msgstr[2] "{0} bodov"
 
-#: ../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 značka"
 
-#: ../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"
@@ -8512,5 +8650,5 @@
 msgstr[2] "značiek"
 
-#: ../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"
@@ -8520,9 +8658,9 @@
 msgstr[2] "{0} pozostáva z {1} značiek"
 
-#: ../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 "Synchronizovať audio"
 
-#: ../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."
@@ -8531,5 +8669,5 @@
 "synchronizácie."
 
-#: ../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
@@ -8537,14 +8675,14 @@
 msgstr "Zvuk zosynchronizovaný na bode {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 "Nie je možné synchronizovať v už prehrávanej vrstve"
 
-#: ../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 "Vytvoriť Zvukovú značku v \"Play Head\""
 
-#: ../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 "
@@ -8553,5 +8691,5 @@
 "Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
 
-#: ../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 ""
@@ -8559,9 +8697,9 @@
 "posunutie."
 
-#: ../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 "Zobraziť/Skryť Text/Ikony"
 
-#: ../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 "Prepínač zobrazovania značiek textu a ikon."
@@ -8629,5 +8767,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 "Prosím vyberte riadok na úpravu."
@@ -8641,5 +8779,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."
@@ -9336,12 +9474,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
-#, fuzzy
 msgid "Active styles"
-msgstr "Aktivovať"
+msgstr "Aktívne štýly"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "Dostupné štýly (z {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
@@ -9376,60 +9513,54 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Pridať názov súboru, alebo URL z aktívnych štýlov"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
+msgstr "Odstrániť vybraté štýly z obsahu aktívnych štýlov"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
+msgstr "Upraviť názov súboru, alebo URL pre vybraté aktívne štýly"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
+msgstr "Pridať vybraté aktívne štýly do obsahu aktívnych štýlov"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Znovu načítať obsah aktívnych štýlov z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Pridať novú značku"
+msgstr "Pridať novú cestu pre ikony"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Zavrieť vybrané otvorené zmenové súbory"
+msgstr "Odstrániť vybraté cesty ikon"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Upraviť zvolený zdroj."
+msgstr "Upraviť vybraté cesty ikon"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Nahrať históriu pre bod {0}"
+msgstr "Vložiť zdroje štýlov z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to load the list of style sources from<br>''{0}''."
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Nepodarilo sa nahrať dáta na alebo stiahnuť z<br>\"{0}\"<br>pre "
-"problém pri prenose dát.<br>Detaily (nepreložené): {1}</html>"
+"<html>Neúspešné načítanie obsahu zdrojov štýlov z<br>''{0}''.<br><br>Detaily "
+"(nepreložené):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
@@ -9703,10 +9834,10 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "Prednastavená skupina {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "Prednastavená skupina {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
@@ -10062,5 +10193,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}''."
@@ -10087,5 +10218,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}."
@@ -10093,5 +10224,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}"
@@ -10104,5 +10235,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}''."
@@ -10268,5 +10399,5 @@
 msgstr "Súbor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -10277,30 +10408,30 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 ""
 "vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
 
-#: ../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 "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
 
-#: ../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 "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
 
-#: ../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 ""
 "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
 
-#: ../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 "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
 
-#: ../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}"
@@ -10308,10 +10439,10 @@
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
 
-#: ../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 "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10320,19 +10451,19 @@
 "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
 
-#: ../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 "Nekompletné <member> špecifikácie s 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 "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
 
-#: ../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 "Neplatný objekt s 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 ""
@@ -10344,9 +10475,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 ""
@@ -10358,25 +10489,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 "Neznáma, alebo nepodporovaná API verzia. Got {0}"
 
-#: ../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 "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
 
-#: ../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 "Chýba povinná vlastnosť ''{0}''."
 
-#: ../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 "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426
 #, java-format
 msgid ""
@@ -10385,5 +10516,5 @@
 "Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10394,5 +10525,5 @@
 "chýbajúci v nahratých dátach a je preto neúplná tiež."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10400,5 +10531,5 @@
 msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10409,13 +10540,13 @@
 "''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr "Rozložiť OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr "Pripravujem dátový súbor ..."
@@ -10428,5 +10559,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Sťahovanie z OSM Servera..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -10573,14 +10704,14 @@
 
 #: ../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} Pluginy je úspešne stiahnuté. Prosím reštartujte JOSM."
-msgstr[1] "{0} Plugin je úspešne stiahnutý. Prosím reštartujte JOSM."
-msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM."
+msgstr[0] "{0} Plugin úspešne stiahnutý."
+msgstr[1] "{0} Pluginy úspešne stiahnuté."
+msgstr[2] "{0} Pluginov úspešne stiahnutých."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Prosím reštartujte JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -10639,11 +10770,10 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Aktualizácia pluginov"
+msgstr "Aktualizovať pluginy"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 msgid "Skip update"
-msgstr ""
+msgstr "Vynechať aktualizáciu"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
@@ -10784,35 +10914,4 @@
 "{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 "neznámy"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
@@ -10948,4 +11047,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
+"<html>Zatváranie zmenového súboru <strong>{0}</strong> neúspešné<br> pretože "
+"už bol zavretý na {1}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
@@ -10955,8 +11056,10 @@
 "(untranslated):<br>{0}</html>"
 msgstr ""
+"<html>Server poslal správu, že objavil konflikt.<br>Chybová správa "
+"(nepreložená):<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
-msgstr ""
+msgstr "<html>Server poslal správu, že objavil konflikt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
@@ -11493,47 +11596,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 "Získavam GPS polohu z EXIF"
 
-#: ../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 "Začínam prehľadávať adresár"
 
-#: ../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 "Niektorý z vybratých súborov bol prázdny !!!"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
+msgstr "Niektorý z vybratých súborov bol prázdny"
+
+#: ../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 "Čítať fotky..."
 
-#: ../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 "Nemôžem získať cestu pre adresár {0}\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 "Prehľadávam adresár {0}"
 
-#: ../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 "Nájdený prázdny súbor v adresári {0}\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 "Chyba pri získavaní súború z adresára {0}\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 "Zladiť GPX"
 
-#: ../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."
@@ -11549,24 +11651,24 @@
 msgstr "Načítať sadu obrázkov na novú vrstvu."
 
-#: ../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 "Súbory GPX (*.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 "Súbor {0} je ešte nahratý pod menom \"{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 "Chyba pri rozkladaní {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 "Nemôžem čítať \"{0}\""
 
-#: ../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."
@@ -11578,34 +11680,34 @@
 "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 "Čas fotografie (z 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 čas (čítaj nad fotografiou) "
 
-#: ../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 "Som v časovej zóne: "
 
-#: ../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 "Žiaden dátum"
 
-#: ../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 "Otvoriť inú fotografiu"
 
-#: ../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 "Synchronizovať čas z fotky a GPS prímača"
 
-#: ../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"
@@ -11615,70 +11717,70 @@
 "Prosím použite požadovaný formát."
 
-#: ../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 "Neplatný dátum"
 
-#: ../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 "<Nie je zatiaľ nahratá GPX stopa (track)>"
 
-#: ../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 stopa(trasa): "
 
-#: ../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 "Otvoriť inú GPX stopu(trasu)"
 
-#: ../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 "Časové pásmo: "
 
-#: ../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 "Vyrovnať(Offset):"
 
-#: ../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>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</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 "Aktualizovať pozíciu pre: "
 
-#: ../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 "Všetky obrázky"
 
-#: ../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 "Obrázky bez exif pozície"
 
-#: ../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 "Zatiaľ neoznačkované obrázky"
 
-#: ../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 "Zladiť obrázky s GPX stopou(track)"
 
-#: ../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 "Zladiť"
 
-#: ../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 "Auto-Guess"
 
-#: ../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 "Môžete vybrať GPX stopu(track)"
 
-#: ../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 "Nevybratá GPX stopa(track)"
 
-#: ../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 ""
@@ -11689,9 +11791,9 @@
 "Čakám na formát: {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 "Neplatné časové pásmo"
 
-#: ../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 ""
@@ -11702,65 +11804,65 @@
 "Čakám na formát: {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 "Neplatné vyrovnanie (offset)"
 
-#: ../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 "Najdené {0} zhody z {1} v GPX stope {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 "Nahratá GPX stopa(trasa)"
 
-#: ../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 "Vybraté fotografie neobsahujú informácie o čase."
 
-#: ../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 "Fotografie neobsahujú informácie o čase."
 
-#: ../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."
 msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
 
-#: ../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 Stopa nemá informáciu o čase."
 
-#: ../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 "Časové pásmo: {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 "Minút: {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 "Sekúnd: {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 "Zladené {0} z {1} fotiek k GPX stope."
 
-#: ../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 "(Časový rozdiel z {0} dní)"
 
-#: ../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 "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
 
-#: ../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 "
@@ -11770,13 +11872,13 @@
 "posúvač ručne na fotky."
 
-#: ../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 "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../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 "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../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 "Východzie hodnoty"
@@ -11797,5 +11899,5 @@
 msgstr "Chyba v súbore {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11811,37 +11913,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 "Vybrať Feuille"
 
-#: ../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 "Chyba pri nahrávaní súboru"
 
-#: ../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 "Lambert Zóna 1 cache súbor (.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 "Lambert Zóna 2 cache súbor (.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 "Lambert Zóna 3 cache súbor (.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 "Lambert Zóna 4 cache súbor (.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: Nedovolená url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11855,18 +11957,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 "Vybrať hranice obce(samosprávy)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Vybrať z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
@@ -11898,35 +12000,35 @@
 "boli: {0}"
 
-#: ../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 "Nahradiť pôvodné pozadie farbou JOSM pozadia."
 
-#: ../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 "Opačná šedá farba (pre čierne pozadia)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Nastaviť priehľadné pozadie"
 
-#: ../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 "Kresliť okraje okolo stiahnutých dát."
 
-#: ../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 ""
 "Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "Enable automatic caching."
 msgstr "Povoliť automatické cachovanie."
 
-#: ../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 "Maximálna veľkost cache (v 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."
@@ -11943,18 +12045,18 @@
 "<BR>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "French cadastre WMS (Francúzsky kataster 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 "<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../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 "
@@ -11964,5 +12066,5 @@
 "JOSM."
 
-#: ../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). "
@@ -11972,75 +12074,75 @@
 "pre texty na tmavých pozadiach."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Povoliť vyrovnanie viacnásobných vrstiev"
 
-#: ../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 "Nastaviť priehľadnosť WMS vrstiev"
 
-#: ../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 "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera."
 
 #. 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 "Zachytávač vektorových obrázkov multiplikátor:"
 
-#: ../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 ""
 "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)"
 
-#: ../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 "Pevná veľkosť štvorcov (východzia 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 "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176
 msgid "Raster images grab multiplier:"
 msgstr "Zachytávač rastrových obrázkov multiplikátor:"
 
 #. 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 "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Dodatočný zdroj automatických-značiek:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Pridať \"source=...\" do položiek?"
 
-#: ../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 "Sťahujem {0}"
 
-#: ../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 "Kontaktujem WMS server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Vytvoriť budovy"
 
-#: ../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"
@@ -12050,30 +12152,30 @@
 "zvoľte pre import max. veľkosť 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 "Prosím, zapnite automatický zdroj a kontrolu štvorcov máp katastra."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "Vyberte SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Vyberte najvhodnejšie rozhranie(hranice)..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Vytvorte rozhranie(hranice)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr "Spájam cadastre WMS ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr "Obrázok je už načítaný"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -12083,29 +12185,29 @@
 "Použite normálne Cadastre Grab menu."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "Vybrať hranice obce(samosprávy)"
 
-#: ../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 "Iba na vektorizované vrstvy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Získať stopy budov"
 
-#: ../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 "Stiahnuť obrázok z francúzkeho Cadastre WMS"
 
-#: ../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"
@@ -12117,19 +12219,21 @@
 "projekcií a opakovať"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:48
 msgid "Grab non-georeferenced image"
 msgstr "Zachytený obrázok bez zemepisných súradníc"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:69
 msgid "Georeferencing interrupted"
 msgstr "Určovanie zemepisných súradníc prerušené"
 
-#: ../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"
 "Do you want to use them ?"
 msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
+"Tento obrázok obsahuje georeferenčné dáta.\n"
+"Chcete ich použiť?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
 msgid ""
 "Click first corner for image cropping\n"
@@ -12139,14 +12243,14 @@
 "(povinné sú dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
 msgid "Image cropping"
 msgstr "Orezávanie obrázkov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
 msgid "Click second corner for image cropping"
 msgstr "Kľukni na druhý roh pre orezanie obrázka"
 
-#: ../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"
@@ -12156,10 +12260,10 @@
 "(povinné sú dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
 msgid "Image georeferencing"
 msgstr "Určovanie zemepisnej polohy obrázkov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
@@ -12167,5 +12271,5 @@
 "(georeferencing)"
 
-#: ../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"
@@ -12175,64 +12279,64 @@
 "alebo len opakovať "
 
-#: ../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 "Vstúpiť do cadastre na východ, sever pozícii"
 
-#: ../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 "(Varovanie: potvrdte sever so šípkou !!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "East"
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr "Sever"
 
-#: ../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 "Zvoliť {0} Lambert súradnice"
 
-#: ../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
+msgstr "Manuálne nastaviť Lambert zone"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Zone"
 msgstr "Zóna (oblasť)"
 
-#: ../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 "Načítať polohu z cache (iba ak je cache zapnutá)"
 
-#: ../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
+msgstr "{0} nepovolený s aktuálnou projekciou"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Zmeniť umiestnenie"
 
-#: ../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 "Nastavenie nového miesta pre ďalšiu požiadavku"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Pridať novú vrstvu"
 
-#: ../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 "Umiestnenie"
 
-#: ../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 "
@@ -12242,25 +12346,25 @@
 "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 "Pridať novú vrstvu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Vymazať cookie"
 
-#: ../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 "Získať nové cookie (časový limit na súčasné sedenie)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr "PNG súbory (*.png)"
 
-#: ../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 "Exportovať ako PNG formát (iba rastrové obrázky)"
 
-#: ../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
@@ -12271,20 +12375,22 @@
 msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)"
 
-#: ../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 "Nastaviť WMS"
 
-#: ../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 "Upraviť pozíciu WMS vrstvy (iba rastrové obrázky)"
 
-#: ../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"
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
+"Tento režim pracuje iba ak  aktívna vrstva je\n"
+"a cadastre \"plan image\" (rastrový obrázok)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:20
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
 #, java-format
@@ -12292,5 +12398,5 @@
 msgstr "Sťahovať WMS dlaždice z {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"
@@ -12300,34 +12406,34 @@
 "Najskôr vyberte jednu z nich a potom zopakujte"
 
-#: ../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 "Prázdna vrstva"
 
-#: ../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 vrstva ({0}), {1} dlaždice(dlaždíc) načítané"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Nie je vektorizované."
 
-#: ../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 "Veľkosť rastra: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Je vektorizované."
 
-#: ../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 "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -12338,9 +12444,9 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../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}"
@@ -12349,9 +12455,9 @@
 "Lambertova zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Cache chýb v Lambert Zóne"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12460,9 +12566,9 @@
 msgstr "Vytvoriť duplikát cesty"
 
-#: ../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 "Vrstva na úoravu GPX stôp(tracks)"
 
-#: ../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 "Konvertovať do GPX vrstvy s neznámym časom"
@@ -12479,11 +12585,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 "Importovať cestu z GPX vrstvy"
 
 #: ../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 "Zahodiť existujúcu cestu"
@@ -12493,5 +12599,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 "GPS dátová vrstva nie je vytvorená."
@@ -12704,5 +12810,5 @@
 msgstr "Zobraziť fotky bez informácií o polohe"
 
-#: ../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 "Importované obrázky"
@@ -13136,5 +13242,5 @@
 msgstr "Úhol medzi dvoma zvolenými bodmi"
 
-#: ../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 "Vrstva pre vykonávanie meraní"
@@ -13170,5 +13276,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
 msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Pre neschopnosť usporiadať cesty. Prosím skontrolovať ich smery"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
@@ -13200,9 +13306,9 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
+msgstr "Multipolygón sa musí skladať iba z uzavretých ciest."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Musíte vybrať aspoň dve cesty."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -13214,5 +13320,5 @@
 msgstr "OpenStreetBugs sťahovaná slučka"
 
-#: ../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 "Zobrazuje chyby z OpenStreetBugs"
@@ -13356,7 +13462,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Vrstva"
+msgstr "PicLayer"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13523,43 +13628,41 @@
 msgstr "Vstup hmotnostnej hodnoty"
 
-#: ../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 Map"
 
-#: ../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 "Automatické zväčšenie: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
+msgstr "Auto Zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../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 "Zobraz info"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+msgstr "Ukázať Info Dlaždíc"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../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 "Priblíženie"
 
-#: ../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 "Oddialiť"
 
-#: ../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 "Flush Tile Cache"
 
-#: ../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 "obrázok "
@@ -13595,7 +13698,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max zväčšenie lvl: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13952,6 +14054,6 @@
 msgstr "Ste si istý?"
 
-#: ../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
@@ -13959,5 +14061,5 @@
 msgstr "Overovanie chýb"
 
-#: ../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 "Žiadne chyby na overenie"
@@ -14050,5 +14152,5 @@
 msgstr "ostatné overovania"
 
-#: ../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}"
@@ -14148,7 +14250,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Neusporiadané pobrežie"
+msgstr "Nepripojená pobrežná čiara"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -14158,5 +14259,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr ""
+msgstr "Obrátená pobrežná čiara"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -14180,18 +14281,18 @@
 msgstr "Zkrížené cesty"
 
-#: ../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 "Duplicitné body"
 
-#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste."
 
-#: ../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 "Body s rovnakou pozíciou"
 
-#: ../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 "Potvrdenie"
@@ -14228,5 +14329,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
 msgid "Missing name:* translation."
-msgstr ""
+msgstr "Chýbajúce meno:* prekladu."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -14239,5 +14340,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
 msgid "A name:* translation is missing."
-msgstr ""
+msgstr "Meno:* preklad je chýbajúci."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:73
@@ -14351,80 +14452,80 @@
 #. 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 "Problém s vykresľováním"
 
-#: ../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 "Klúč ''{0}'' je neplatný."
 
-#: ../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 "Klúče s prázdnými hodnotami"
 
-#: ../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 "Neplatné vlastnosti kľúča"
 
-#: ../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 "Neplatná medzera vo vlastnosti klúča"
 
-#: ../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 "Hodnota začíná alebo končí medzerou"
 
-#: ../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 "Hodnota obsahuje HTML entitu"
 
-#: ../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 "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt."
 
-#: ../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 "Predvoľba neobsahuje vlastnosti kľúča"
 
-#: ../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 "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname."
 
-#: ../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 "Predvoľba neobsahuje vlastnost hodnoty"
 
-#: ../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 "FIXMES"
 
-#: ../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 "Kontrola vlastností kľúčov."
 
-#: ../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 "Porovnáva hodnoty kľúčov oproti zoznamu slov."
 
-#: ../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 "Použíť komplexnú kontrolu vlastností"
 
-#: ../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 "Kontroluje platnosť hodnôt a značiek pomocou komplexných pravidiel."
 
-#: ../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 "Zdroj pre TagChecker"
 
-#: ../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."
@@ -14435,86 +14536,86 @@
 "značiek."
 
-#: ../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 "Pridať nový zdroj do zoznamu."
 
-#: ../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 "Upraviť zvolený zdroj."
 
-#: ../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 "Zmazať vybratý zdroj zo zoznamu."
 
-#: ../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 "Zdroje dát"
 
-#: ../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 "Kontrola hodnôt vlastností."
 
-#: ../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 "Porovnáva platnosť hodnôt vlastností oproti prednastaveným hodnotám."
 
-#: ../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 "Kontrola pre FIXMES."
 
-#: ../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 "Vyhľadá body, alebo cesty s FIXME v hodnotách vlastností."
 
-#: ../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 "Kontrola pre poznámky (notes)"
 
-#: ../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 "Kontrola či pri kreslení mapy nevznikli chyby."
 
-#: ../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 "Použiť predvolený dátový súbor."
 
-#: ../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 "Použiť predvolený dátový súbor (doporučené)."
 
-#: ../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 "Použite predvolený súbor pre ignorované značky."
 
-#: ../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 "Použite predvolený súbor pre ignorované značky (doporučené)."
 
-#: ../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 "Použite predovlený súbor pre spellcheck (preklepy)."
 
-#: ../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 "Použite predvolený súbor pre spellcheck (doporučené)."
 
-#: ../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 "Oprava vlastností"
 
-#: ../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 "Nemôžem nájsť typ elementu"
 
-#: ../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 "Nemôžem nájsť úroveň varovania."
 
-#: ../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 "Neplatný výraz ''{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}''"
@@ -14691,17 +14792,17 @@
 msgstr "Tento test kontroluje blízkosť koncových bodov ciest k iným cestám"
 
-#: ../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 "Koncový bod cesty je blízko inej komunikácie"
 
-#: ../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 "Koncový bod cesty je blízko inej cesty"
 
-#: ../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 "Bod cesty je blízko inej cesty"
 
-#: ../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 "Spojený koncový bod cesty je blízko inej cesty"
@@ -14753,13 +14854,13 @@
 msgstr "Tento test kontroluje smer vodných, pozemných a pobrežných línií."
 
-#: ../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 "Obrátené pobrežie: zem nie je na ľavej strane"
 
-#: ../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 "Obrátená vodná cesta: zem nie je na ľavej strane"
 
-#: ../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 "Obrátená zem: zem nie je na ľavej strane"
@@ -14797,92 +14898,76 @@
 
 #: ../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 vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
+msgstr "Walking Papers vrstva ({0}) vo zväčšení {1}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-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 "Vybrať a spustiť body na konci cesty"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr "Je dosiahnutý koniec línie"
-
-#. 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"
-msgstr "Je dosiahnuté spojenie"
+msgstr "Walking Papers"
+
+#: ../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 "Stiahnuť"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Stiahnutie mapových údajov z OSM servera."
+
+#: ../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>Nie sú tam vrstvy zdrojovej vrstvy<br>''{0}''<br>nemôžu byť zlúčené.</"
+"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 "Odstraňujem duplicitné body..."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#, fuzzy
+msgid "<html>No more connected ways to download.</html>"
+msgstr "<html>Nie je vybraná oblasť pre stiahnutie.</html>"
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "Nastala výnimka/chyba"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "nápoveda"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Nápoveda / o programe"
-
-#: ../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 ""
-"Môžete pridať, editovať and mazať WMS údaje vo WMSplugin Preference Tab - "
-"toto sa potom zobrazí vo WMS menu.\n"
-"\n"
-"Môžete to tiež urobiť manuálne v Advanced Preferences, Použite nasledujúcu "
-"schému:\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"
-"Úplný WMS URL vstupný format napríklad (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ,"
-"potrebujete iba aktuálne vstupné 'id'.\n"
-"Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL ako "
-"v tomto príklade, položenie 73 vášho obrázka 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"
-"Poznámka: Použite iba vhodné obrázky, voľne šíriteľné(copyright-wise), ak "
-"máte pochybnosti, nepoužite ich."
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "Nápoveda WMS Pluginu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14991,9 +15076,9 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatické sťahovanie"
 
-#: ../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}''"
@@ -15001,19 +15086,19 @@
 "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../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 vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../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 vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -15028,13 +15113,13 @@
 "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../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"
@@ -15042,42 +15127,42 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../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 "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
@@ -15326,4 +15411,6 @@
 "relation editor."
 msgstr ""
+"Vytvorenie multipolygónov na jedno kľuknutie, o mnoho ľahšie, ako obvyklou "
+"cestou cez editor relácií."
 
 #. Plugin nearclick
@@ -19282,5 +19369,5 @@
 #: build/trans_presets.java:1711
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "Edit Theme Park"
 
 #: build/trans_presets.java:1716
@@ -19556,14 +19643,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Archeologické nálezisko"
+msgstr "Palaeontological Areál"
 
 #. 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 "Upraviť archeologické nálezisko"
+msgstr "Upraviť Palaeontological Areál"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -21846,5 +21931,5 @@
 #: build/trans_presets.java:2476
 msgid "gray"
-msgstr ""
+msgstr "šedá"
 
 #: build/trans_presets.java:2476
@@ -26881,5 +26966,5 @@
 #: build/trans_style.java:3383
 msgid "woodarea"
-msgstr ""
+msgstr "zalesnená oblasť (woodarea)"
 
 #. color water
@@ -27537,109 +27622,98 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "File could not be found."
-#~ msgstr "Súbor nie je možné nájsť."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Nahrávanie na OSM API neúspešné"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktné vzťahy (relation)"
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
+
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii"
+
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "nenájdená predchádzajúca verzia. História je prázdna."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "nenájdená staršia verzia. História je prázdna."
+
+#~ msgid "No type found. History is empty."
+#~ msgstr "Typ nenájdený. História(priebeh) je prázdna."
+
+#~ msgid "Didn't find an primitive with id {0} in this dataset"
+#~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
+
+#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+#~ msgstr "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "Vybrať a spustiť body na konci cesty"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "Je dosiahnutý koniec línie"
+
+#~ msgid "Reached a junction"
+#~ msgstr "Je dosiahnuté spojenie"
+
+#~ msgid "help"
+#~ msgstr "nápoveda"
+
+#~ msgid "Help / About"
+#~ msgstr "Nápoveda / o programe"
 
 #~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
+#~ "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 ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
-#~ "relácie?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
-#~ "html>"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Chyba pri rozkladaní"
-
-#~ msgid "File not found"
-#~ msgstr "Súbor nebol nájdený"
-
-#~ msgid "Replace"
-#~ msgstr "Nahradiť"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
+#~ "Môžete pridať, editovať and mazať WMS údaje vo WMSplugin Preference Tab - "
+#~ "toto sa potom zobrazí vo WMS menu.\n"
+#~ "\n"
+#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite "
+#~ "nasledujúcu schému:\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"
+#~ "Úplný WMS URL vstupný format napríklad (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ,"
+#~ "potrebujete iba aktuálne vstupné 'id'.\n"
+#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL "
+#~ "ako v tomto príklade, položenie 73 vášho obrázka 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"
+#~ "Poznámka: Použite iba vhodné obrázky, voľne šíriteľné(copyright-wise), ak "
+#~ "máte pochybnosti, nepoužite ich."
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Nápoveda WMS Pluginu"
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
 
 #~ msgid "Please enter the desired coordinates first."
 #~ msgstr "Prosím najskôr zadajte požadované koordináty."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Najskôr zvoľte záložku"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Prosím zadajte hľadaný reťazec"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera"
-
-#~ msgid "name"
-#~ msgstr "meno"
-
-#~ msgid "zoom"
-#~ msgstr "zväčšenie"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Kopírovať východzie"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vyberte riadok na kopírovanie."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Pridať nový XML zdroj do zoznamu."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "Môžete zmeniť počet dní pre objavovanie sa tohto varovania <br>by setting "
-#~ "the config option 'pluginmanager.warntime'.)"
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
-#~ "východziu geometriu. Detaily: {1}"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Zobraziť Stav Dlaždíc"
-
-#~ msgid "Request Update"
-#~ msgstr "Žiadosť na aktualizáciu"
-
-#~ msgid "error loading metadata"
-#~ msgstr "chyba pri zavádzaní metadát"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "požadovaný: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "chyba požadovanej aktualizácie"
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
 
 #~ msgid "No document open so nothing to save."
@@ -27698,4 +27772,7 @@
 #~ msgstr "Poslať komentár"
 
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najskôr zvoľte záložku"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -27774,6 +27851,12 @@
 #~ msgstr "JOSM Online Nápoveda"
 
+#~ msgid "File not found"
+#~ msgstr "Súbor nebol nájdený"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
+
+#~ msgid "name"
+#~ msgstr "meno"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -27819,7 +27902,25 @@
 #~ msgstr "Importovať TCX súbor..."
 
+#~ msgid "Request Update"
+#~ msgstr "Žiadosť na aktualizáciu"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Zobraziť Stav Dlaždíc"
+
+#~ msgid "requested: {0}"
+#~ msgstr "požadovaný: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "chyba požadovanej aktualizácie"
+
+#~ msgid "error loading metadata"
+#~ msgstr "chyba pri zavádzaní metadát"
+
 #~ msgid "Copy Default"
 #~ msgstr "Skopírovať východzí"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vyberte riadok na kopírovanie."
+
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 #~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS"
@@ -27836,4 +27937,10 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Prosím zadajte hľadaný reťazec"
+
+#~ msgid "zoom"
+#~ msgstr "zväčšenie"
 
 #~ msgid "Validate"
@@ -27951,4 +28058,13 @@
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Zmazať {1} {0}"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktné vzťahy (relation)"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Chyba pri rozkladaní"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera"
 
 #~ msgid ""
@@ -28067,4 +28183,11 @@
 
 #~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "Môžete zmeniť počet dní pre objavovanie sa tohto varovania <br>by setting "
+#~ "the config option 'pluginmanager.warntime'.)"
+
+#~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
 #~ "version by deleting existing archive?\n"
@@ -28207,4 +28330,7 @@
 #~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny."
 
+#~ msgid "File could not be found."
+#~ msgstr "Súbor nie je možné nájsť."
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Niektoré z bodov sú (skoro) na priamke"
@@ -28224,4 +28350,7 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Všetky cesty boli prázdne"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -28321,4 +28450,7 @@
 #~ msgstr "parameter '{0}' nesmie byť nulový"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Nahrávanie na OSM API neúspešné"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
@@ -28441,9 +28573,24 @@
 #~ msgstr "Členy: {0} (spojenie: {1})"
 
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Kopírovať východzie"
+
 #~ msgid "No data"
 #~ msgstr "Žiadne dáta"
 
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Pridať nový XML zdroj do zoznamu."
+
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Odstrániť člena relácie {0} {1}"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
 
 #~ msgid "Download referrers from OSM..."
@@ -28563,4 +28710,18 @@
 #~ "pokračovať?"
 
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
+#~ "html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
+#~ "relácie?</html>"
+
 #~ msgid "Close current changeset"
 #~ msgstr "Zavrieť aktuálny súbor zmien"
@@ -28631,4 +28792,10 @@
 #~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''"
 
+#~ msgid "Replace"
+#~ msgstr "Nahradiť"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
+
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chýba povinný atribút ''{0}''"
@@ -28711,4 +28878,11 @@
 #~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
 #~ "''{1}''"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
+#~ "východziu geometriu. Detaily: {1}"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 18508)
+++ applications/editors/josm/i18n/po/sl.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:47+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:17+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -48,18 +48,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
@@ -69,6 +69,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
@@ -76,11 +75,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
@@ -95,4 +94,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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "Napaka"
@@ -208,6 +209,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"
@@ -313,5 +314,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
@@ -329,6 +330,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
@@ -339,5 +340,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
@@ -456,5 +457,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
@@ -496,5 +497,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
@@ -503,6 +504,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"
@@ -684,5 +686,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
@@ -695,5 +697,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"
@@ -765,5 +767,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
@@ -771,28 +781,28 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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}"
@@ -829,10 +839,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 "Izvoz v 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 "Izvoz v datoteko oblike GPX."
@@ -845,11 +855,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
@@ -880,5 +889,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
@@ -893,17 +901,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
@@ -963,5 +972,5 @@
 msgstr "Vključi izbrano vozlišče v najbližji del poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Priključi vozlišče v pot"
@@ -992,20 +1001,19 @@
 msgstr "Izberite vsaj dve vozlišči za združitev"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Prekinjanje ..."
-
-#: ../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 "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1146,7 +1154,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Sprejem podatkov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1293,10 +1300,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 "Shrani"
 
 #: ../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 "Shrani trenutne podatke"
@@ -1351,10 +1358,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 "Shrani kot..."
 
 #: ../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 "Shrani trenutne podatke v novo datoteko"
@@ -1395,25 +1402,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 "Zapri"
 
-#: ../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 "Razdeli pot"
 
-#: ../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 "Razdeli pot pri izbranem vozlišču."
 
-#: ../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 ""
 
-#: ../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."
@@ -1423,5 +1430,5 @@
 msgstr[3] "Izbrana vozlišča niso na sredini nobene poti."
 
-#: ../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 "
@@ -1435,9 +1442,9 @@
 msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot."
 
-#: ../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 "Izbrana vozlišča niso del iste poti."
 
-#: ../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."
@@ -1447,10 +1454,10 @@
 msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
 
-#: ../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 "Za razdelitev krožne poti izberite dve ali več vozlišč."
 
-#: ../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 "
@@ -1460,5 +1467,5 @@
 "sredini poti.)"
 
-#: ../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 "
@@ -1466,5 +1473,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 "
@@ -1472,5 +1479,5 @@
 msgstr ""
 
-#: ../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"
@@ -1500,47 +1507,47 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Izberite bodisi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Eno vozlišče z oznakami"
 
-#: ../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 "* Eno vozlišče, ki je del več poti, ali"
 
-#: ../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 "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali"
 
-#: ../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"
 msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali"
 
-#: ../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."
 msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti."
 
-#: ../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"
@@ -1550,9 +1557,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1560,5 +1567,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"
@@ -1605,5 +1612,5 @@
 #.
 #: ../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 ""
@@ -1619,6 +1626,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Posodobi izbor"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1632,10 +1640,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 "Kopiraj izbrane predmete v odložišče"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Izbor je prazen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Posodobi izbor"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1780,7 +1794,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Spremeni {0} predmetov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1902,9 +1916,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Sprejem podatkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1912,5 +1926,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 ""
@@ -1926,7 +1940,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Ime uporabnika."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1970,7 +1983,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Napake pri sprejemu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1984,5 +1996,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
@@ -2013,6 +2025,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 "izbrano"
@@ -2030,26 +2042,26 @@
 msgstr "Dodaj vozlišče v pot"
 
-#: ../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 "Poveži obstoječo pot z vozliščem"
 
-#: ../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 "Dodaj novo vozlišče v pot"
 
-#: ../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 "Dodaj in poveži vozlišče v pot"
 
-#: ../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 "Ustvari novo vozlišče."
 
-#: ../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 "Izberi vozlišče pod kazalcem miške."
 
-#: ../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."
@@ -2060,46 +2072,44 @@
 msgstr[3] "Vstavi novo vozlišče v {0} poti."
 
-#: ../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 "Začni novo pot od zadnjega vozlišča"
 
-#: ../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 "Nadaljuj pot od zadnjega vozlišča."
 
-#: ../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 "Zaključi risanje."
 
-#: ../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 "Izrini"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Ustvari površine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Izrini pot"
 
-#: ../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 "Za izbor predmetov v pravokotniku izpustite miškin gumb."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb."
 
-#: ../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 "Za prenehanje vrtenja izpustite miškin gumb."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Povlecite segment poti za ustvarjenje pravokotnika."
 
@@ -2154,4 +2164,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2160,4 +2174,8 @@
 "Za prenehanje premikanja izpustite miškin gumb. Ctrl za združitev z "
 "najbližjo točko."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Za prenehanje vrtenja izpustite miškin gumb."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2183,67 +2201,70 @@
 msgstr ""
 
-#: ../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 "Išči..."
 
-#: ../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 "Iskanje predmetov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Prosim, vnesite iskalni izraz."
 
-#: ../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 "regularni izraz"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "nadomesti izbor"
 
-#: ../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 "dodaj v izbor"
 
-#: ../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 "odstrani iz izbora"
 
-#: ../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 "upoštevaj velikost črk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "regularni izraz"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2251,34 +2272,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2286,43 +2307,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2332,51 +2353,51 @@
 msgstr ""
 
-#: ../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 "Iskanje"
 
-#: ../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 "Začni iskanje"
 
-#: ../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 ""
 
-#: ../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 "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
 
-#: ../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 "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar"
 
-#: ../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 "Najdeno {0} zadetkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr ""
@@ -2542,6 +2563,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
@@ -2668,5 +2689,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 ""
@@ -2687,9 +2708,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}'' ne sme biti ničen"
+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"
@@ -2725,5 +2749,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 ""
@@ -2731,6 +2755,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."
@@ -2739,5 +2763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2748,5 +2772,15 @@
 msgstr ""
 
-#: ../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"
@@ -2828,5 +2862,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"
@@ -2931,8 +2965,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
 msgid "Illegal double value ''{0}''"
-msgstr "Privzeta vrednost je ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3112,5 +3152,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
@@ -3124,5 +3164,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 ""
@@ -3130,4 +3170,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
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../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 ""
 
@@ -3185,32 +3261,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Napaka: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Opozorilo: {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 ""
 
@@ -3235,45 +3312,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}'' ne sme biti ničen"
+
+#: ../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
@@ -3284,6 +3344,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 ""
 
@@ -3294,145 +3355,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Neznana vloga ''{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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "besedilo"
 
-#: ../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 "Napaka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Opozorilo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr ""
 
-#: ../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
@@ -3444,5 +3505,5 @@
 msgstr[3] "vozlišča"
 
-#: ../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
@@ -3454,6 +3515,6 @@
 msgstr[3] "poti"
 
-#: ../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
@@ -3465,13 +3526,13 @@
 msgstr[3] "relacije"
 
-#: ../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 ""
 
-#: ../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 "nepopolna pot"
 
-#: ../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
@@ -3479,5 +3540,5 @@
 msgstr "ozadje"
 
-#: ../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 ""
@@ -3556,5 +3617,5 @@
 msgstr "Ne prikaži več"
 
-#: ../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
@@ -3562,32 +3623,32 @@
 msgstr ""
 
-#: ../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 "nepopoln"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "cesta"
 
-#: ../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 "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vodotok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "raba tal"
 
-#: ../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"
@@ -3598,5 +3659,5 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3607,33 +3668,33 @@
 msgstr[3] "{0} člani"
 
-#: ../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
@@ -3641,9 +3702,9 @@
 msgstr "Spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Neznan gostitelj"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3854,5 +3915,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 "Uredi"
@@ -3978,10 +4039,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 "plasti ni na seznamu."
 
-#: ../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"
@@ -4110,5 +4171,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"
@@ -4117,5 +4178,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"
@@ -4125,5 +4186,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 "Člani"
@@ -4552,5 +4613,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 ""
@@ -4608,6 +4669,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 ""
@@ -4736,4 +4795,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"
@@ -4830,5 +4890,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"
@@ -4839,5 +4899,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"
@@ -4878,7 +4938,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Odpri seznam vseh relacij."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4964,5 +5023,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
@@ -5056,5 +5115,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"
@@ -5110,11 +5169,11 @@
 msgstr "Prikaži zgodovino izbranih predmetov"
 
-#: ../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
@@ -5122,13 +5181,13 @@
 msgstr "Ponovno naloži"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -5185,7 +5244,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] "Spremenili boste do {0} predmetov."
@@ -5195,5 +5253,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 "Prazna vrednost izbriše ključ"
 
@@ -5220,4 +5279,13 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
+#: ../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] "Spremenili boste do {0} predmetov."
+msgstr[1] "Spremenili boste do {0} predmet."
+msgstr[2] "Spremenili boste do {0} predmeta."
+msgstr[3] "Spremenili boste do {0} predmete."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5294,60 +5362,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 "Relacije"
 
-#: ../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 "Odpri seznam vseh relacij."
 
-#: ../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 ""
 
-#: ../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 "Odpri urejevalnik za izbrano relacijo"
 
-#: ../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 "Izbriši izbrano relacijo"
 
-#: ../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 "Ustvari novo relacijo"
 
-#: ../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 "Izbriši izbrano relacijo"
-
-#: ../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 "Izberite bodisi:"
-
-#: ../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 "Izbriši izbrano relacijo"
-
-#: ../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 "Sprejmi področje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5502,5 +5566,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}"
@@ -5739,18 +5803,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 ""
@@ -5773,5 +5837,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}"
@@ -5853,12 +5917,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Ustvari površine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Pomakni izbranega člana vrstico nižje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5869,7 +5931,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 "Prosim, vnesite ime kraja."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5879,12 +5940,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Pomakni izbranega člana vrstico višje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Pomakni izbranega člana vrstico višje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5943,7 +6002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Razdeli pot pri izbranem vozlišču."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5952,7 +6010,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5976,7 +6033,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Izbriši izbrano plast."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5994,12 +6050,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Pomakni izbranega člana vrstico višje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Prosim izberite vrstico za urejanje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6015,7 +6069,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Vnesite ime kraja, ki ga želite poiskati:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6029,7 +6082,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Išči..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
@@ -6963,7 +7015,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "blizu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7008,5 +7059,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 ""
@@ -7020,5 +7071,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 ""
@@ -7029,5 +7080,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 ""
@@ -7036,19 +7087,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 ""
@@ -7058,32 +7109,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 ""
@@ -7105,37 +7156,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 ""
@@ -7143,5 +7194,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 ""
@@ -7149,9 +7200,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 ""
@@ -7160,24 +7211,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}'' ne sme biti ničen"
+
+#: ../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}"
@@ -7190,4 +7251,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Povečava na težavo"
+
+#: ../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 "Zgodovina"
+
+#: ../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
@@ -7200,17 +7279,66 @@
 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
+msgid "not present"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr ""
 
-#: ../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 "neznan"
+
+#: ../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 "Anonimno"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7235,4 +7363,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 "Različica {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "izbrisano"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7577,11 +7720,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] "Spremenjeni predmeti:"
-msgstr[1] "Spremenjeni predmeti:"
-msgstr[2] "Spremenjeni predmeti:"
-msgstr[3] "Spremenjeni predmeti:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7661,13 +7802,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
@@ -7734,5 +7875,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}..."
@@ -7744,5 +7885,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 "Slike z geografskim položajem"
@@ -7768,5 +7909,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"
@@ -7823,43 +7964,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 "točka GPS"
 
 #: ../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 ""
 
 #: ../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 ""
 
 #: ../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 "Riši povezave med točkami na tej plasti."
 
 #: ../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 "Ne riši povezav med točkami na tej plasti."
 
 #: ../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 ""
 
 #: ../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 "Prilagodi barvo"
 
 #: ../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"
@@ -7867,6 +8008,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"
@@ -7956,10 +8097,10 @@
 msgstr[1] ""
 
-#: ../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 "Pretvori v podatkovno plast"
 
-#: ../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."
@@ -7967,43 +8108,43 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../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 "Sprejmi vse znotraj:"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8014,9 +8155,9 @@
 "nadaljevati?</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 ""
 
-#: ../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 "
@@ -8024,5 +8165,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8066,6 +8207,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8079,6 +8218,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
@@ -8086,35 +8223,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} izbrisan.)"
-msgstr[1] " ({0} izbrisan.)"
-msgstr[2] " ({0} izbrisan.)"
-msgstr[3] " ({0} izbrisan.)"
-
-#: ../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} je sestavljen iz:"
 
-#: ../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 ""
 
-#: ../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 "Pretvori v plast GPX"
 
-#: ../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."
@@ -8122,5 +8257,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"
@@ -8129,5 +8264,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"
@@ -8137,5 +8272,5 @@
 msgstr[3] "točke"
 
-#: ../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"
@@ -8146,5 +8281,5 @@
 msgstr[3] "sled z {0} točkami"
 
-#: ../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"
@@ -8153,5 +8288,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8162,9 +8297,9 @@
 msgstr[3] "{0} točke"
 
-#: ../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 ""
 
-#: ../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"
@@ -8172,5 +8307,5 @@
 msgstr[1] ""
 
-#: ../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"
@@ -8179,14 +8314,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -8194,14 +8329,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -8209,13 +8344,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Prikaži/skrij besedilo/ikone"
 
-#: ../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 ""
@@ -8279,5 +8414,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 "Prosim izberite vrstico za urejanje."
@@ -8291,5 +8426,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."
@@ -9002,12 +9137,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Izbriši izbrani vir iz seznama."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9021,17 +9154,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Dodaj vozlišče v pot"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Osveži seznam izbora."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Izbriši izbrano relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9649,5 +9779,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}''."
@@ -9674,5 +9804,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}."
@@ -9680,5 +9810,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}"
@@ -9691,5 +9821,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}''."
@@ -9840,5 +9970,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9847,38 +9977,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 ""
@@ -9886,19 +10016,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 ""
 
-#: ../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 "predmet z id=0 ni dovoljen"
 
-#: ../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 ""
@@ -9909,9 +10039,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 ""
@@ -9921,25 +10051,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 ""
@@ -9947,5 +10077,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9954,5 +10084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9960,5 +10090,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9967,13 +10097,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 "Priprava podatkov OSM..."
 
-#: ../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 ""
@@ -10125,11 +10255,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} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
-msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
-msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
-msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10191,7 +10319,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Posodobitev vstavkov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10336,35 +10463,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 "neznan"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10975,47 +11071,46 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Pomakni izbrano plast vrstico višje."
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11031,24 +11126,24 @@
 msgstr "Naloži slike v novo plast."
 
-#: ../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 "Datoteke GPX (*.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 ""
 
-#: ../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 "Napaka pri razčlenjevanju {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 "Ni bilo možno prebrati \"{0}\""
 
-#: ../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."
@@ -11057,34 +11152,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11092,69 +11187,69 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Vse slike"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11163,9 +11258,9 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11174,65 +11269,65 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11240,13 +11335,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11267,5 +11362,5 @@
 msgstr "Napaka v datoteki {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11278,37 +11373,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11320,18 +11415,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11358,34 +11453,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11397,18 +11492,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11416,5 +11511,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11422,74 +11517,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11497,30 +11592,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11528,29 +11623,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11559,13 +11654,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"
@@ -11573,5 +11668,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"
@@ -11579,14 +11674,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"
@@ -11594,14 +11689,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"
@@ -11609,64 +11704,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11674,25 +11769,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11702,14 +11797,14 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11717,5 +11812,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
@@ -11723,5 +11818,5 @@
 msgstr "Naloži vidne ploščice WMS iz {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"
@@ -11729,34 +11824,34 @@
 msgstr ""
 
-#: ../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 "Prazna plast"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11765,18 +11860,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11883,9 +11978,9 @@
 msgstr ""
 
-#: ../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 ""
@@ -11902,11 +11997,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 ""
 
 #: ../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 ""
@@ -11916,5 +12011,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 ""
@@ -12124,5 +12219,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12546,5 +12641,5 @@
 msgstr "Kot med dvema izbranima vozliščema"
 
-#: ../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 ""
@@ -12623,5 +12718,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12754,7 +12849,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Plast"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12918,43 +13012,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 ""
 
-#: ../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 "Povečava"
-
-#: ../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 "Naloži ploščico"
 
-#: ../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 "Prikaži stanje ploščice"
-
-#: ../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 "Naloži vse ploščice"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -12990,7 +13082,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Nivo povečave"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13335,6 +13426,6 @@
 msgstr "Ali ste prepričani?"
 
-#: ../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
@@ -13342,5 +13433,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -13427,5 +13518,5 @@
 msgstr ""
 
-#: ../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}"
@@ -13554,18 +13645,18 @@
 msgstr ""
 
-#: ../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 "Podvojena vozlišča"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13717,80 +13808,80 @@
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -13798,86 +13889,86 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Izbriši izbrani vir iz seznama."
 
-#: ../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 "Viri podatkov"
 
-#: ../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 "Preveri vrednosti lastnosti."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Uporabi privzeto datoteko."
 
-#: ../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 "Uporabi privzeto datoteko (priporočeno)."
 
-#: ../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 "Uporabi privzeto datoteko za črkovanje."
 
-#: ../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 "Uporabi privzeto datoteko za črkovanje (priporočeno)."
 
-#: ../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 "Popravi lastnosti"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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}''"
@@ -14052,17 +14143,17 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14113,13 +14204,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14163,18 +14254,60 @@
 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 "Sprejemanje"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Sprejmi podatke zemljevida s strežnika OSM."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Podvojena vozlišča"
+
+#: ../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 ""
 
@@ -14182,43 +14315,4 @@
 msgid "Exception occurred"
 msgstr ""
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "pomoč"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Pomoč / O programu"
-
-#: ../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 "Pomoč vstavka WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14320,28 +14414,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14352,55 +14446,55 @@
 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"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 "Shrani plast WMS v datoteko"
 
-#: ../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 "Naloži plast WMS iz datoteke"
 
-#: ../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 "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr ""
@@ -18822,14 +18916,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Arheološko najdišče"
+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 "Uredi arheološko najdišče"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26798,18 +26890,106 @@
 msgstr ""
 
+#~ msgid "help"
+#~ msgstr "pomoč"
+
+#~ msgid "Help / About"
+#~ msgstr "Pomoč / O programu"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Pomoč vstavka WMS"
+
+#~ msgid "Move"
+#~ msgstr "Premakni"
+
+#~ msgid "Data Layer"
+#~ msgstr "Podatkovna plast"
+
+#~ msgid "No data imported."
+#~ msgstr "Nič podatkov ni bilo uvoženih."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosim, vnesite želene koordinate."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najprej izberite zaznamek."
+
 #~ msgid "File could not be found."
 #~ msgstr "Datoteke ni bilo moč najti."
 
-#~ msgid "Error while parsing"
-#~ msgstr "Napaka pri razčlenjevanju"
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neshranjene spremembe"
+
+#~ msgid "their version:"
+#~ msgstr "njihova različica:"
+
+#~ msgid "my version:"
+#~ msgstr "moja različica:"
+
+#~ msgid "Object"
+#~ msgstr "Predmet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektov s konflikti:"
+#~ msgstr[1] "{0} objekt s konfliktom:"
+#~ msgstr[2] "{0} objekta s konflikti:"
+#~ msgstr[3] "{0} objekti s konflikti:"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uporabniško ime (email)"
+
+#~ msgid "position"
+#~ msgstr "položaj"
+
+#~ msgid "different"
+#~ msgstr "različno"
+
+#~ msgid "false"
+#~ msgstr "napačno"
+
+#~ msgid "true"
+#~ msgstr "pravilno"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
+
+#~ msgid "Email"
+#~ msgstr "E-pošta"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Spori pri zlivanju"
+
+#~ msgid "unnamed"
+#~ msgstr "neimenovano"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na "
+#~ "strežnik."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznana končnica datoteke."
 
 #~ msgid "File not found"
 #~ msgstr "Datoteke ni mogoče najti"
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Prosim, vnesite želene koordinate."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Najprej izberite zaznamek."
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Izbriši {1} {0}"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Združim poti z različnim članstvom?"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
 
 #~ msgid "Please enter a search string"
@@ -26819,6 +26999,44 @@
 #~ msgstr "Rezultata iskanja kraja se ne da prebrati s strežnika"
 
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Preveri pravilnost vseh podatkov ali samo izbora."
+
+#~ msgid "Request Update"
+#~ msgstr "Zahtevaj posodobitev"
+
+#~ msgid "Edit Station"
+#~ msgstr "Uredi postajo"
+
+#~ msgid "Station"
+#~ msgstr "Postaja"
+
 #~ msgid "zoom"
 #~ msgstr "povečava"
+
+#~ msgid "Validate"
+#~ msgstr "Preveri"
+
+#~ msgid "Unknown version"
+#~ msgstr "Neznana različica"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Neveljaven id točke"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
+#~ "sprejeti."
+
+#~ msgid "Upload to OSM..."
+#~ msgstr "Pošlji v OSM ..."
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih "
+#~ "ste dobili JOSM."
 
 #~ msgid ""
@@ -26829,147 +27047,27 @@
 #~ "možnosti 'pluginmanager.warntime' v nastavitvah.)"
 
-#~ msgid "Request Update"
-#~ msgstr "Zahtevaj posodobitev"
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Vstavek že obstaja"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}."
+
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org"
+
+#~ msgid "Public"
+#~ msgstr "Javna"
+
+#~ msgid "Update Data"
+#~ msgstr "Posodobitev podatkov"
 
 #~ msgid "error requesting update"
 #~ msgstr "napaka pri oddaji zahtevka za pososobitev"
-
-#~ msgid "Move"
-#~ msgstr "Premakni"
-
-#~ msgid "Data Layer"
-#~ msgstr "Podatkovna plast"
-
-#~ msgid "No data imported."
-#~ msgstr "Nič podatkov ni bilo uvoženih."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neshranjene spremembe"
-
-#~ msgid "their version:"
-#~ msgstr "njihova različica:"
-
-#~ msgid "my version:"
-#~ msgstr "moja različica:"
-
-#~ msgid "Object"
-#~ msgstr "Predmet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektov s konflikti:"
-#~ msgstr[1] "{0} objekt s konfliktom:"
-#~ msgstr[2] "{0} objekta s konflikti:"
-#~ msgstr[3] "{0} objekti s konflikti:"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uporabniško ime (email)"
-
-#~ msgid "position"
-#~ msgstr "položaj"
-
-#~ msgid "different"
-#~ msgstr "različno"
-
-#~ msgid "false"
-#~ msgstr "napačno"
-
-#~ msgid "true"
-#~ msgstr "pravilno"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spori pri zlivanju"
-
-#~ msgid "unnamed"
-#~ msgstr "neimenovano"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Namig: Do nekaterih sprememb je prišlo zaradi pošiljanja podatkov na "
-#~ "strežnik."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznana končnica datoteke."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Izbriši {1} {0}"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Združim poti z različnim članstvom?"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Preveri pravilnost vseh podatkov ali samo izbora."
-
-#~ msgid "Edit Station"
-#~ msgstr "Uredi postajo"
-
-#~ msgid "Station"
-#~ msgstr "Postaja"
-
-#~ msgid "Validate"
-#~ msgstr "Preveri"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznana različica"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Neveljaven id točke"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Vstavek {0} izgleda pokvarjen, ali pa ga ni bilo mogoče samodejno "
-#~ "sprejeti."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Pošlji v OSM ..."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Vstavka ni bilo mogoče odstraniti. Prosimo. povejte to ljudem od katerih "
-#~ "ste dobili JOSM."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Napaka pri brisanju datoteke vstavka: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Vstavek že obstaja"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Vstavek zahteva posodobitev programa JOSM: {0}."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Javna"
-
-#~ msgid "Update Data"
-#~ msgstr "Posodobitev podatkov"
 
 #~ msgid ""
@@ -27046,4 +27144,7 @@
 #~ msgstr "relacije"
 
+#~ msgid "Error while parsing"
+#~ msgstr "Napaka pri razčlenjevanju"
+
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "parameter '{0}' ne sme biti ničen"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 18508)
+++ applications/editors/josm/i18n/po/sv.po	(revision 18656)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-11-05 17:19+0000\n"
-"Last-Translator: Gustav Arnesson <Unknown>\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-14 19:58+0000\n"
+"Last-Translator: zvenzzon <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\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:23+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:06+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 "Fel"
@@ -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"
@@ -316,5 +317,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
@@ -332,6 +333,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
@@ -342,5 +343,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
@@ -461,5 +462,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
@@ -501,5 +502,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
@@ -508,6 +509,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"
@@ -695,5 +697,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
@@ -706,5 +708,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 ""
 
-#: ../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 "{0} konflikter uppstod under import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "Konflikter under nerladdningen"
 
-#: ../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 "Exportera till 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 "Exportera data till en GPX-fil"
@@ -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 "Anslut en nod till det närmaste avsnittet av en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Förena nod och linje"
@@ -1004,22 +1013,19 @@
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Avbryter..."
-
-#: ../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 ""
-"Det går inte att slå ihop noderna: En väg som fortfarande används skulle "
-"behöva tas bort."
-
-#: ../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 "Hämtar data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1312,10 +1317,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 "Spara"
 
 #: ../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 "Spara nuvarande data."
@@ -1372,10 +1377,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 "Spara som..."
 
 #: ../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 "Spara nuvarande data i en ny fil."
@@ -1418,25 +1423,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 "Stäng"
 
-#: ../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 "Dela sträcka"
 
-#: ../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 "Dela sträckan vid vald nod."
 
-#: ../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 "Det går inte att dela baserat på nuvarande urval."
 
-#: ../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."
@@ -1444,5 +1449,5 @@
 msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
 
-#: ../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 "
@@ -1458,9 +1463,9 @@
 "sträckan."
 
-#: ../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 valda noderna ingår inte i samma sträcka."
 
-#: ../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."
@@ -1468,10 +1473,10 @@
 msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
-#: ../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 "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../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 "
@@ -1481,5 +1486,5 @@
 "sträckan.)"
 
-#: ../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 "
@@ -1487,5 +1492,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 "
@@ -1493,5 +1498,5 @@
 msgstr ""
 
-#: ../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"
@@ -1521,38 +1526,38 @@
 msgstr "Duplicera noder som används av flera olika sträckor."
 
-#: ../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 "Denna nod är inte bunden till något annat."
 
-#: ../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 "Ingen av dessa noder hänger ihop med någonting annat."
 
-#: ../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 "Ingen av noderna på denna sträcka är knuten till något annat."
 
-#: ../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 "Det nuvarande urvalet kan inte användas för att frigöra något."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Välj antingen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* En nod med tagg, eller"
 
-#: ../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 "* En nod som används av mer än en sträcka, eller"
 
-#: ../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 ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
 
-#: ../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"
@@ -1561,5 +1566,5 @@
 "eller"
 
-#: ../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."
@@ -1568,5 +1573,5 @@
 "sträcka."
 
-#: ../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"
@@ -1581,9 +1586,9 @@
 "få sina egna kopior och alla noder kommer att vara valda."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Frigjord nod"
 
-#: ../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"
@@ -1591,5 +1596,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"
@@ -1630,12 +1635,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Rita gränser för data hämtade från servern."
+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 ""
@@ -1651,6 +1655,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "Uppdatera markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1664,5 +1669,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
+#, fuzzy
+msgid "There are no selected objects to update."
 msgstr "Det finns inga markerade primitiv att uppdatera."
 
@@ -1670,4 +1676,9 @@
 msgid "Selection empty"
 msgstr "Tom markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Uppdatera markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1817,7 +1828,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Ändra {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1939,9 +1950,9 @@
 msgstr "Hämtade GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Hämtar data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1949,5 +1960,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 ""
@@ -1963,7 +1974,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Användarnamn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2002,7 +2012,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
-#, fuzzy, java-format
+#, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "Följande fel uppstod vid massnedladdning:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2012,7 +2022,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Fel under nedladdning"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2026,5 +2035,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
@@ -2057,6 +2066,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 "markerad"
@@ -2074,26 +2083,26 @@
 msgstr "Lägg till en nod till sträckan"
 
-#: ../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 "Knyt en existerande nod till en sträcka"
 
-#: ../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 "Lägg till en ny nod i en befintlig sträcka"
 
-#: ../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 "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../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 "Skapa ny nod"
 
-#: ../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 "Markera nod under pekare."
 
-#: ../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."
@@ -2102,46 +2111,44 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../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 "Starta ny väg från senaste nod."
 
-#: ../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 "Fortsätt väg från senaste nod."
 
-#: ../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 "Avsluta ritning."
 
-#: ../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 "Dra ut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Skapa ytor"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Dra ut sträcka"
 
-#: ../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 "Släpp musknappen för att välja objekten i rektangeln."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
 
-#: ../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 "Släpp musknappen för att sluta rotera."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Dra en delsträcka för bilda en rektangel."
 
@@ -2198,4 +2205,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Släpp musknappen för att välja objekten i rektangeln."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2204,4 +2215,8 @@
 "Släpp musknappen för att sluta flytta. Ctrl för att slå ihop med närmaste "
 "nod."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Släpp musknappen för att sluta rotera."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2231,51 +2246,54 @@
 "ned, höger; flytta karta med högerknappen"
 
-#: ../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 "Sök..."
 
-#: ../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 "Sök efter objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Ange en söksträng."
 
-#: ../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 "reguljärt uttryck"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "ersätt urval"
 
-#: ../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 "utöka urval"
 
-#: ../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 "ta bort från urval"
 
-#: ../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 "gör skillnad på gemener/VERSALER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "reguljärt uttryck"
 
-#: ../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 ""
@@ -2283,5 +2301,5 @@
 "värde som helst."
 
-#: ../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 ""
@@ -2289,13 +2307,13 @@
 "som helst."
 
-#: ../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:Bak</b> - 'Bak' var som helst i nyckeln name."
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2303,17 +2321,17 @@
 msgstr ""
 
-#: ../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:Bak</b> - som inte har 'Bak'  i nyckeln name."
 
-#: ../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> - som innehåller nyckeln foot oavsett dess värde."
 
-#: ../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>Särskilda mål:</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>)"
@@ -2322,54 +2340,53 @@
 "<b>relation</b> för relation)"
 
-#: ../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>user:</b>... - alla objekt som ändrats av användare..."
 
-#: ../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>... - objekt med givent antal noder"
 
-#: ../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>... - objekt med givent antal noder"
-
-#: ../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> - alla ändrade objekt"
 
-#: ../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> - alla valda objekt"
 
-#: ../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> - alla ofullständiga objekt"
 
-#: ../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>otaggade</b> - alla otaggede objekt"
 
-#: ../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 "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
 
-#: ../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 ""
@@ -2377,9 +2394,9 @@
 "innehåller :)"
 
-#: ../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 "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
 
-#: ../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
@@ -2389,51 +2406,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 "Sök"
 
-#: ../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 "Påbörja sökning"
 
-#: ../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 "Inga sökträffar för ''{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 "Urvalet utökades inte genom att söka efter ''{0}''"
 
-#: ../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 "Urvalet begränsades inte genom att söka efter ''{0}''"
 
-#: ../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} sökträffar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr "RX"
@@ -2483,7 +2500,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "Felaktigt antal parametrar för nodoperator."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
@@ -2611,6 +2627,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
@@ -2735,5 +2751,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 ""
@@ -2754,9 +2770,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 "parametern ''{0}'' får inte vara null"
+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"
@@ -2792,5 +2811,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 "Dela delsträcka"
@@ -2798,6 +2817,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."
@@ -2809,5 +2828,5 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2818,5 +2837,15 @@
 msgstr ""
 
-#: ../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"
@@ -2900,5 +2929,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"
@@ -3005,8 +3034,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 "Nuvarande värde är ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3186,5 +3221,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
@@ -3198,5 +3233,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 ""
@@ -3204,4 +3239,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 "Det saknas argument för inte (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 ""
 
@@ -3259,32 +3330,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Fel: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varning: {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 ""
 
@@ -3309,45 +3381,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 "Det finns inget primitiv med version {0} i denna historik"
-
-#: ../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} > 0 krävs. Erhöll {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr "ingen tidigaste version funnen. Historiken är tom."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr "ingen senaste version funnen. Historiken är tom."
-
-#: ../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
@@ -3358,6 +3413,7 @@
 msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
 
-#: ../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
+#, fuzzy, java-format
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
 
@@ -3368,145 +3424,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 "En sträcka för en yta är inte sluten."
 
-#: ../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 "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#: ../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 "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../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 "Sträcka \"{0} med mindre än två punkter."
 
-#: ../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 "Det finns mer än en \"från\"-sträcka."
 
-#: ../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 "Det finns mer än en \"till\"-sträcka."
 
-#: ../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 "Mer än en \"via\" hittades."
 
-#: ../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 "Okänd roll ''{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 "Okänd medlemstyp för ''{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 "Det finns inte någon \"från\"-sträcka."
 
-#: ../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 "Det finns inte någon \"till\"-sträcka."
 
-#: ../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 "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../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 "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../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 "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../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 "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../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 "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../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 "Stil för restriktion {0} kunde inte hittas."
 
-#: ../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 "Intersektionen mellan sträckorna ''{0}'' och ''{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 "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#: ../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 "Ingen användbar roll ''{0}'' för sträckan ''{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 "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../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 "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../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 "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../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 "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../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 "otaggade"
 
-#: ../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 "text"
 
-#: ../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 "Fel: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../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
@@ -3516,5 +3572,5 @@
 msgstr[1] "noder"
 
-#: ../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
@@ -3524,6 +3580,6 @@
 msgstr[1] "sträckor"
 
-#: ../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
@@ -3533,13 +3589,13 @@
 msgstr[1] "relationer"
 
-#: ../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 "otaggade sträcka"
 
-#: ../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 "ofullständig sträcka"
 
-#: ../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
@@ -3547,5 +3603,5 @@
 msgstr "bakgrund"
 
-#: ../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 "framhäv"
@@ -3629,5 +3685,5 @@
 msgstr "Visa inte igen"
 
-#: ../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
@@ -3635,32 +3691,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 "ofullständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "landsväg"
 
-#: ../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 "järnväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "vattendrag"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "markanvändning"
 
-#: ../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"
@@ -3669,5 +3725,5 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3676,33 +3732,33 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr "Brott mot förhandsvillkor"
 
-#: ../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
@@ -3710,9 +3766,9 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Okänd värddator"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3931,5 +3987,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 "Redigera"
@@ -4055,10 +4111,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 "lagret finns inte i listan."
 
-#: ../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"
@@ -4066,7 +4122,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "Nej, avbryt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4188,5 +4243,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"
@@ -4195,5 +4250,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"
@@ -4203,5 +4258,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 "Medlemmar"
@@ -4632,5 +4687,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 ""
@@ -4688,6 +4743,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 ""
@@ -4816,4 +4869,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"
@@ -4910,5 +4964,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"
@@ -4919,5 +4973,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"
@@ -4936,7 +4990,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
-#, fuzzy
 msgid "Keep"
-msgstr "Behåll mina"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -4959,7 +5012,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Ange värden för alla konflikter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4979,7 +5031,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
-#, fuzzy
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5046,5 +5097,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
@@ -5139,5 +5190,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"
@@ -5193,11 +5244,11 @@
 msgstr "Visa historik för alla valda poster."
 
-#: ../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
@@ -5205,13 +5256,13 @@
 msgstr "Uppdatera"
 
-#: ../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 "Läs om alla de nu valda objekten och uppdatera listan."
 
-#: ../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 ""
@@ -5268,7 +5319,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] "Detta kommer att ändra upp till {0} objekt."
@@ -5276,5 +5326,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 "Om värdet är tomt tas nyckeln bort."
 
@@ -5299,4 +5350,11 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
+#: ../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] "Detta kommer att ändra upp till {0} objekt."
+msgstr[1] "Detta kommer att ändra upp till {0} objekt."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5373,60 +5431,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 "Relationer"
 
-#: ../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 "Öppna en lista över alla relationer"
 
-#: ../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 "Relationer: {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 "Öppna en redigerare för den valda relationen"
 
-#: ../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 "Ta bort den valda relationen"
 
-#: ../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 "Skapa en ny relation"
 
-#: ../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 "Ta bort den valda relationen"
-
-#: ../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 "Välj antingen:"
-
-#: ../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 "Ta bort den valda relationen"
-
-#: ../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 "Hämta medlemmar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5583,5 +5637,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}"
@@ -5820,18 +5874,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 ""
@@ -5854,5 +5908,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}"
@@ -5934,12 +5988,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Skapa gräns"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Flytta vald medlem/valda medlemmar nedåt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5950,7 +6002,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 "Ange platsens namn."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5960,12 +6011,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Flytta vald medlem/valda medlemmar uppåt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Flytta vald medlem/valda medlemmar uppåt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5975,5 +6024,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
-msgstr "min lat"
+msgstr "min lon"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
@@ -6025,7 +6074,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Dela sträckan vid vald nod."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6034,7 +6082,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Den valda sträckan innehåller inte den valda noden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6058,7 +6105,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Inget GPX-spår har valts"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6076,12 +6122,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Flytta vald medlem/valda medlemmar uppåt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Välj vilken rad du vill ändra."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6097,7 +6141,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Ange ett platsnamn att söka efter:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6111,12 +6154,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Sök..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Riktning att söka efter land i"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7046,7 +7087,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "nära"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7091,5 +7131,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 ""
@@ -7103,5 +7143,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 ""
@@ -7112,5 +7152,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 ""
@@ -7119,19 +7159,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 ""
@@ -7141,32 +7181,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 ""
@@ -7188,37 +7228,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 ""
@@ -7226,5 +7266,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 ""
@@ -7232,9 +7272,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 ""
@@ -7243,24 +7283,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} > 0 krävs. Erhöll {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
+
+#: ../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}"
@@ -7273,4 +7323,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Zooma till problem"
+
+#: ../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 "historiskt"
+
+#: ../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
@@ -7283,17 +7351,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 "Sortera snabbvalsmenyn"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Användare"
 
-#: ../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 "okänd"
+
+#: ../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 "Anonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7318,4 +7436,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 "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "raderad"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7660,9 +7793,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] "Ändrade objekt:"
-msgstr[1] "Ändrade objekt:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7742,13 +7875,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
@@ -7815,5 +7948,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}..."
@@ -7825,5 +7958,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 "Geotaggade bilder"
@@ -7849,5 +7982,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"
@@ -7902,43 +8035,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-punkt"
 
 #: ../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 "Anpassa linjeritning"
 
 #: ../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 "Använd globala inställningar"
 
 #: ../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 "Rita linjer mellan punkter i detta lager."
 
 #: ../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 "Rita inte linjer mellan punkter i detta lager."
 
 #: ../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 "Välj alternativ för linjeritning"
 
 #: ../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 "Anpassa färger"
 
 #: ../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"
@@ -7946,6 +8079,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"
@@ -8035,10 +8168,10 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../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 "Omvandla till datalager"
 
-#: ../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."
@@ -8048,43 +8181,43 @@
 "skicka in spår, se här:"
 
-#: ../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 "Omvandlad från:{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 "Hämta från OSM längs med detta spår"
 
-#: ../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 "Hämta allting inom:"
 
-#: ../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} meter"
 
-#: ../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 "Största tillåtna område per begäran:"
 
-#: ../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 ""
@@ -8095,9 +8228,9 @@
 "Önskar du<br>fortsätta?</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 "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../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 "
@@ -8107,5 +8240,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../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 "
@@ -8167,33 +8300,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} raderad.)"
-msgstr[1] " ({0} raderad.)"
-
-#: ../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} består av:"
 
-#: ../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 ""
 
-#: ../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 "Omvandla till gpx-lager"
 
-#: ../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."
@@ -8201,5 +8334,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"
@@ -8208,5 +8341,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"
@@ -8214,5 +8347,5 @@
 msgstr[1] "punkter"
 
-#: ../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"
@@ -8221,5 +8354,5 @@
 msgstr[1] "ett spår med {0} punkter"
 
-#: ../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"
@@ -8228,5 +8361,5 @@
 msgstr[1] "{0} består av {1} spår"
 
-#: ../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"
@@ -8235,9 +8368,9 @@
 msgstr[1] "{0} punkter"
 
-#: ../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-markör"
 
-#: ../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"
@@ -8245,5 +8378,5 @@
 msgstr[1] "markörer"
 
-#: ../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"
@@ -8252,14 +8385,14 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../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 "Synkronisera ljud"
 
-#: ../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 "Du behöver pausa ljudet precis när du hör synkroniseringsindikatorn."
 
-#: ../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
@@ -8267,14 +8400,14 @@
 msgstr "Ljud synkroniserat vid punkt {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 "Det går inte att synkronisera i det lager som spelas upp."
 
-#: ../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 "Skapa ljudmarkör vid spelhuvud"
 
-#: ../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 "
@@ -8284,13 +8417,13 @@
 "markören."
 
-#: ../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 ""
 
-#: ../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 "Visa/Dölj text/ikoner"
 
-#: ../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 "Växla visning av markörtext och ikoner."
@@ -8357,5 +8490,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 "Välj vilken rad du vill ändra."
@@ -8369,5 +8502,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."
@@ -9106,12 +9239,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Ta bort vald källa från listan."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Redigera värdet av den valda nyckeln för alla objekt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9125,17 +9256,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Lägg till ett nytt lager"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Uppdatera urvalslistan."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Redigera vald källa."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9779,5 +9907,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}''."
@@ -9804,5 +9932,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}."
@@ -9810,5 +9938,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}"
@@ -9821,5 +9949,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}''."
@@ -9971,5 +10099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9978,38 +10106,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 ""
@@ -10017,19 +10145,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 "Ofullständig <roll>-specifikation med 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 "Ogiltigt objekt med 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 ""
@@ -10040,9 +10168,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 ""
@@ -10052,25 +10180,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 ""
@@ -10078,5 +10206,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10085,5 +10213,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10091,5 +10219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10098,13 +10226,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 "Förbereder OSM-data..."
 
-#: ../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 ""
@@ -10256,9 +10384,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} Insticksmodulen har uppdaterats. Starta om JOSM."
-msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10320,7 +10448,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Uppdatera insticksmoduler"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10468,35 +10595,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 "okänd"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11126,47 +11222,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 "Extraherar GPS-plats från EXIF"
 
-#: ../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 "Påbörjar foldergenomläsning"
 
-#: ../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 "En av de valda filerna var null !!!"
-
-#: ../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 "Läs in foton..."
 
-#: ../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 ""
 
-#: ../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 "Läser igenom folder {0}"
 
-#: ../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 ""
 
-#: ../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 "Fel vid läsning av filer från folder {0}\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 "Korrelerar med GPX"
 
-#: ../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."
@@ -11182,24 +11277,24 @@
 msgstr "Hämta en uppsättning bilder som ett nytt lager."
 
-#: ../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-filer"
 
-#: ../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 "Filen {0} är fortfarande aktiv under namnet \"{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 "Fel vid tolkning {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 "Kunde inte öppna \"{0}\""
 
-#: ../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."
@@ -11211,34 +11306,34 @@
 "välj en tidzon<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 "Fototid (från 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-tid (läst från fotot ovan): "
 
-#: ../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 "Jag är i följande tidzon: "
 
-#: ../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 "Inget 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 "Öppna ett annat 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 "Synkronisera tid med hjälp av ett foto av GPS-mottagaren"
 
-#: ../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"
@@ -11248,29 +11343,29 @@
 "Använd begärt format"
 
-#: ../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 "Ogiltigt 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 "<Inget GPX-spår har hämtats än>"
 
-#: ../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-spår: "
 
-#: ../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 "Öppna ett annat foto"
 
-#: ../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 "Tidszon: "
 
-#: ../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 "Förskjutning:"
 
-#: ../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 ""
@@ -11278,41 +11373,41 @@
 "</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 "Uppdatera position för: "
 
-#: ../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 "Alla bilder"
 
-#: ../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 "Bilder utan positionsangivelse i exif"
 
-#: ../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 "Bilder som inte taggats ännu"
 
-#: ../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 "Sätt bilder i relation till GPX-spår"
 
-#: ../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 "Korrelera"
 
-#: ../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 "Auto-gissa"
 
-#: ../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 "Välj ett GPX-spår"
 
-#: ../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 "Inget GPX-spår har valts"
 
-#: ../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 ""
@@ -11323,9 +11418,9 @@
 "Förväntat format: {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 "Ogiltig tidszon"
 
-#: ../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 ""
@@ -11336,26 +11431,26 @@
 "Förväntat format: {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 "Ogiltig förskjutning"
 
-#: ../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 "Hittade {0} träffar för {1} i GPX-spår {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-spår har hämtats"
 
-#: ../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 markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../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 "Fotografierna innehåller ingen tidsinformation."
 
-#: ../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."
@@ -11363,39 +11458,39 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../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-spåret saknar tidsinformation"
 
-#: ../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 "Tidszon: {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 "Minuter: {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 "Sekunder: {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 "Parade ihop {0} av {1} foton med GPX-spåret"
 
-#: ../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 "(Tidsdifferens om {0} dagar)"
 
-#: ../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 "Förskjutning mellan spår och foton: {0}m {1}s"
 
-#: ../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 "
@@ -11403,13 +11498,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 "Matchning av fotografier mot spår misslyckades"
 
-#: ../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 "Justera tidszon och tidsförskjutning"
 
-#: ../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 "Standardinställningar"
@@ -11430,5 +11525,5 @@
 msgstr "Fel i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11441,37 +11536,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 "Fel vid läsning av fil"
 
-#: ../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 "Lambertzon 1 cachefil (.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 "Lambertzon 1 cachefil (.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 "Lambertzon 1 cachefil (.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 "Lambertzon 1 cachefil (.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: Ogiltig URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11483,18 +11578,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 "Välj commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Välj en av..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Automatkälla"
@@ -11521,34 +11616,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 "Ersätt originalets bakgrund med JOSM:s bakgrundsfärg."
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Gör bakgrunden genomskinlig."
 
-#: ../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 "Rita gränser för hämtade data."
 
-#: ../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 "Aktivera automatisk cachning."
 
-#: ../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 "Största tillåtna cachestorlek (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."
@@ -11560,9 +11655,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 "Fransk Cadastre-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 ""
@@ -11570,10 +11665,10 @@
 "källa är aktiverat.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Källa"
 
-#: ../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 "
@@ -11583,5 +11678,5 @@
 "JOSM:s inställningar."
 
-#: ../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). "
@@ -11591,74 +11686,74 @@
 "gråtoner). Användbart för text på mörka bakgrunder."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Rita en rektangel runt data nedladdad från WMS-servern."
 
 #. 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 "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Äldsta filerna raderas automatiskt när denna storlek överskrids"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Tagg för källa har automatiskt lagts till:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Lägg \"source=...\" till objekt?"
 
-#: ../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 "Hämtar {0}"
 
-#: ../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 "Kontaktar WMS-servern..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Skapa byggnader"
 
-#: ../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"
@@ -11666,30 +11761,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Extrahera den gräns som passar bäst..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Skapa gräns"
 
-#: ../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"
@@ -11697,29 +11792,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 "Extrahera commune-gränser"
 
-#: ../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 "Endast vektoriserade lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Extrahera byggnadskonturer"
 
-#: ../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 "Hämta bild från den franska Cadastre-WMS:en"
 
-#: ../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"
@@ -11728,13 +11823,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"
@@ -11742,5 +11837,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"
@@ -11748,14 +11843,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"
@@ -11763,14 +11858,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"
@@ -11778,64 +11873,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 "Zon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Lambertzon"
 
-#: ../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 "Hämta plats från cachen (enbart om cache är aktiverad)"
 
-#: ../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 "Byt plats"
 
-#: ../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 "Ange en ny plats för nästa förfrågan"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Lägg till ett nytt lager"
 
-#: ../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 "Plats"
 
-#: ../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 "
@@ -11843,25 +11938,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr "Lägg till ett nytt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 "Hämta ny cookie (sessions-timeout)"
 
-#: ../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
@@ -11871,14 +11966,14 @@
 msgstr[1] "Förenkla sträcka (ta bort {0} noder)"
 
-#: ../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 "Justera WMS"
 
-#: ../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"
@@ -11886,5 +11981,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
@@ -11892,5 +11987,5 @@
 msgstr "Hämta WMS-ruta från {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"
@@ -11898,34 +11993,34 @@
 msgstr ""
 
-#: ../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 "Tomt lager"
 
-#: ../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-lager ({0}), {1} ruta/rutor inlästa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Är inte vektoriserad"
 
-#: ../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 "Är vektoriserad"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11936,18 +12031,18 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12054,9 +12149,9 @@
 msgstr "Skapa en dubblett av sträcka"
 
-#: ../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 "Lager för editering av GPX-spår"
 
-#: ../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 "Konvertera till GPX-lager med anonymiserad tid"
@@ -12073,11 +12168,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 "Importera sträckning från GPX-lager"
 
 #: ../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 "Glöm existerande sträckning"
@@ -12087,5 +12182,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 "Inget GPX-datalager kunde hittas."
@@ -12298,5 +12393,5 @@
 msgstr "Visa bilder utan geotaggning"
 
-#: ../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 "Importerade bilder"
@@ -12730,5 +12825,5 @@
 msgstr "Vinkel mellan två valda noder"
 
-#: ../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 "Lager för att utföra mätningar"
@@ -12807,5 +12902,5 @@
 msgstr "Hämtningsloop för 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 "Visar problemfall från OpenStreetBugs"
@@ -12945,7 +13040,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Lager"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13112,43 +13206,41 @@
 msgstr "Ange viktvärden"
 
-#: ../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 "Glidande karta"
 
-#: ../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 "Automatisk zoomning: "
-
-#: ../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 "Hämta ruta"
 
-#: ../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 "Visa status för ruta"
-
-#: ../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 "Hämta alla rutor"
 
-#: ../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 "Öka zoomläge"
 
-#: ../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 "Minska zoomläge"
 
-#: ../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 ""
@@ -13184,7 +13276,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Största tillåtna zoomläge: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13544,6 +13635,6 @@
 msgstr "Är du säker?"
 
-#: ../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
@@ -13551,5 +13642,5 @@
 msgstr "Valideringsfel"
 
-#: ../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 "Inga valideringsfel"
@@ -13640,5 +13731,5 @@
 msgstr "andra typer av validering"
 
-#: ../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}"
@@ -13738,7 +13829,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Oordnad kustlinje"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13768,19 +13858,19 @@
 msgstr "Korsande sträckor"
 
-#: ../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 "Dubbletter av noder"
 
-#: ../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 ""
 "Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
-#: ../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 ""
@@ -13940,80 +14030,80 @@
 #. 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 "Ritningsproblem"
 
-#: ../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 "Nyckeln ''{0}'' är ogiltig."
 
-#: ../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 "Taggar med tomma värden"
 
-#: ../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 "Ogiltig egenskapsnyckel"
 
-#: ../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 "Egenskapsnyckel innehåller ogiltigt blanksteg"
 
-#: ../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 "Egenskapsvärdet börjar eller slutar med blanksteg"
 
-#: ../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 "Det finns en HTML-markör i egenskapsvärdet"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "FIXME-taggar"
 
-#: ../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 "Kontrollera egenskapsnycklar"
 
-#: ../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 "Validera egenskapsnycklar genom att kontrollera mot en lista av ord."
 
-#: ../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 "Använd komplicerad egenskapskontroll."
 
-#: ../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 "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
-#: ../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 "Källa för TagChecker"
 
-#: ../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."
@@ -14024,88 +14114,88 @@
 "taggkontrollera datafiler."
 
-#: ../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 "Lägg till en ny källa till listan."
 
-#: ../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 "Redigera vald källa."
 
-#: ../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 "Ta bort vald källa från listan."
 
-#: ../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 "Datakällor"
 
-#: ../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 "Kontrollera egenskapsvärden"
 
-#: ../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 ""
 "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar."
 
-#: ../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 "Leta efter FIXME-taggar."
 
-#: ../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 ""
 "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde."
 
-#: ../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 "Kontrollera om det finns ritningsanmärkningar."
 
-#: ../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 "Kontrollera om problem uppstod vid ritning av kartan"
 
-#: ../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 "Använd förvald datafil."
 
-#: ../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 "Använd den förvalda datafilen (rekommenderas)."
 
-#: ../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 "Använd förvalda rättstavningsfil."
 
-#: ../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 "Använd den förvalda rättstavningsfilen (rekommenderas)."
 
-#: ../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 "Rätta till egenskaper"
 
-#: ../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 "Kunde inte hitta elementtyp"
 
-#: ../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 "Kunde inte hitta varningsnivå"
 
-#: ../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 "Ogiltigt uttryck ''{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}''"
@@ -14282,17 +14372,17 @@
 "annan sträcka."
 
-#: ../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 "Slutnod nära annan väg"
 
-#: ../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 "Slutnod nära annan sträcka"
 
-#: ../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 "Nod på sträcka nära annan sträcka"
 
-#: ../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 "Slutnod på sträcka nära annan sträcka"
@@ -14349,13 +14439,13 @@
 "land (land) och kustlinje (coastline)."
 
-#: ../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 "Felvänd kustlinje (coastline): land inte på vänster sida"
 
-#: ../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 "Felriktat vatten: land är inte på vänster sida"
 
-#: ../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 "Felriktat land: land inte på vänster sida"
@@ -14391,7 +14481,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-lager ({0}), hämtas i zoomläge {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14399,18 +14489,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 "Hämta"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Hämta kartdata från OSM-servern."
+
+#: ../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>Det finns inga lager som lagret <br>''{0}''<br>kan sammanfogas med.</"
+"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 "Tar bort dubblettnoder..."
+
+#: ../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 ""
 
@@ -14418,43 +14552,4 @@
 msgid "Exception occurred"
 msgstr "Undantag inträffade"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "hjälp"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Hjälp / Om"
-
-#: ../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 "Hjälp om WMS-insticksmodulen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14556,28 +14651,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../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-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../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-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14588,55 +14683,55 @@
 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"
 msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../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 "Hämta WMS-lager från en fil"
 
-#: ../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 "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Fel filformat"
@@ -19063,14 +19158,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Utgrävningsplats"
+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 "Redigera utgrävningsplats"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27039,16 +27132,158 @@
 msgstr ""
 
+#~ msgid "There's no primitive with version {0} in this history."
+#~ msgstr "Det finns inget primitiv med version {0} i denna historik"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "ingen tidigaste version funnen. Historiken är tom."
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "ingen senaste version funnen. Historiken är tom."
+
+#~ msgid "help"
+#~ msgstr "hjälp"
+
+#~ msgid "Help / About"
+#~ msgstr "Hjälp / Om"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Hjälp om WMS-insticksmodulen"
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Osparade ändringar"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Okänd version"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Välj ett bokmärke först."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
 #~ msgid "File could not be found."
 #~ msgstr "Filen kunde inte hittas."
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Alla sträckor var tomma"
+
 #~ msgid "Please select at least one task to download"
 #~ msgstr "Välj åtminstone en uppgift att hämta"
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Uppladningen till OSM API misslyckades"
+#~ msgid "JOSM Online Help"
+#~ msgstr "Onlinehjälp för JOSM"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Fel vid inläsning av sida{0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Öppna i webbläsare"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
+#~ "dem?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Slå ihop noder med olika medlemskap?"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr ""
+#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Jämka {0} konflikter i {1} objekt"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Ta bort {1} {0}"
 
 #~ msgid "Conflicting relation"
 #~ msgstr "Relationskonflikt"
 
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "olik"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sann"
+
+#~ msgid "their version:"
+#~ msgstr "deras version:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objekt har konflikter:"
+#~ msgstr[1] "{0} objekt har konflikter:"
+
+#~ msgid "my version:"
+#~ msgstr "min version:"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Jämkar konflikter"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "No data imported."
+#~ msgstr "Ingen data importerad."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Ange först önskade koordinater."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Taggar (tomt värde tar bort taggen)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Innehas av"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan inte ansluta till server."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Fel vid inläsning av serverns svar."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Konflikter upptäcktes under import."
+
+#~ msgid "name"
+#~ msgstr "namn"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Ansluter till OSM-servern"
+
 #~ msgid "Error while parsing"
 #~ msgstr "Fel vid tolkning"
@@ -27057,24 +27292,101 @@
 #~ msgstr "Filen hittades inte"
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ange först önskade koordinater."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Välj ett bokmärke först."
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Användarnamn (epost) för OSM-kontot"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
+#~ "servern."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
+#~ "JOSM från."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Använd snabbval ''{0}''"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Källor för snabbval för taggning"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Källa till snabbval för taggning"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "Validate"
+#~ msgstr "Validera"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
+
+#~ msgid "zoom"
+#~ msgstr "zooma"
 
 #~ msgid "Please enter a search string"
 #~ msgstr "Ange en söksträng"
 
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan inte läsa sökresultat för plats från servern"
-
-#~ msgid "name"
-#~ msgstr "namn"
-
-#~ msgid "zoom"
-#~ msgstr "zooma"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Välj vilken rad du vill kopiera."
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "requested: {0}"
+#~ msgstr "begärd: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "fel vid hämtning av metadata"
+
+#~ msgid "Request Update"
+#~ msgstr "Begär omrendering"
+
+#~ msgid "error requesting update"
+#~ msgstr "fel vid begäran om uppdatering"
+
+#~ msgid "Station"
+#~ msgstr "Station"
+
+#~ msgid "Edit Station"
+#~ msgstr "Redigera station"
+
+#~ msgid "Charge"
+#~ msgstr "Avgift"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Återställ alla de nu valda objekten till den version som valts i "
+#~ "historiklistan."
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
+#~ "dem?"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
 
 #~ msgid ""
@@ -27085,214 +27397,4 @@
 #~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
 
-#~ msgid "Request Update"
-#~ msgstr "Begär omrendering"
-
-#~ msgid "error loading metadata"
-#~ msgstr "fel vid hämtning av metadata"
-
-#~ msgid "requested: {0}"
-#~ msgstr "begärd: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "fel vid begäran om uppdatering"
-
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Osparade ändringar"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Okänd version"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alla sträckor var tomma"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Onlinehjälp för JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fel vid inläsning av sida{0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Öppna i webbläsare"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Slå ihop noder med olika medlemskap?"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr ""
-#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Jämka {0} konflikter i {1} objekt"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Ta bort {1} {0}"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "their version:"
-#~ msgstr "deras version:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekt har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min version:"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Jämkar konflikter"
-
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "No data imported."
-#~ msgstr "Ingen data importerad."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Innehas av"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan inte ansluta till server."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fel vid inläsning av serverns svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Konflikter upptäcktes under import."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Ansluter till OSM-servern"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Användarnamn (epost) för OSM-kontot"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
-#~ "servern."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
-#~ "JOSM från."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Använd snabbval ''{0}''"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Källor för snabbval för taggning"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Källa till snabbval för taggning"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "Validate"
-#~ msgstr "Validera"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Edit Station"
-#~ msgstr "Redigera station"
-
-#~ msgid "Charge"
-#~ msgstr "Avgift"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Återställ alla de nu valda objekten till den version som valts i "
-#~ "historiklistan."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
-
 #~ msgid "Error deleting plugin file: {0}"
 #~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}"
@@ -27326,4 +27428,7 @@
 #~ msgstr "korrigeringsid={0}"
 
+#~ msgid "Please select the row to copy."
+#~ msgstr "Välj vilken rad du vill kopiera."
+
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
@@ -27340,4 +27445,7 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> har nollreferens"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan inte läsa sökresultat för plats från servern"
 
 #~ msgid "hikingmap"
@@ -27645,4 +27753,7 @@
 #~ "Skicka inte in några data efter du har fått detta meddelande."
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Uppladningen till OSM API misslyckades"
+
 #~ msgid "Undeleting Way..."
 #~ msgstr "Ångrar radering av väg..."
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 18508)
+++ applications/editors/josm/i18n/po/tr.po	(revision 18656)
@@ -10,6 +10,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 14:02+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:33+0000\n"
 "Last-Translator: katpatuka <email@katpatuka.org>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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"
 
@@ -49,18 +49,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
@@ -70,6 +70,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
@@ -77,11 +76,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
@@ -96,4 +95,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"
@@ -120,6 +120,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
@@ -135,7 +135,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
@@ -146,7 +146,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
@@ -172,12 +172,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
@@ -189,6 +189,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 "Hata"
@@ -209,6 +210,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"
@@ -314,5 +315,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
@@ -330,6 +331,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
@@ -340,5 +341,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
@@ -457,5 +458,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
@@ -497,5 +498,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
@@ -504,6 +505,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"
@@ -689,5 +691,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
@@ -700,5 +702,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"
@@ -770,5 +772,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
@@ -776,28 +786,28 @@
 msgstr ""
 
-#: ../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 "Dışalım işlemi esnasında {0} çakışma oldu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr "İndirirken çakışmalar oldu"
 
-#: ../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}"
@@ -834,10 +844,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 "GPX olarak kaydet..."
 
 #: ../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 "Veri GPX dosyası olarak kaydet."
@@ -850,11 +860,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
@@ -885,5 +894,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
@@ -898,17 +906,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
@@ -968,5 +977,5 @@
 msgstr "Noktayı en yakın yol bölümüne birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Nokta ile çizgi birleştir"
@@ -997,21 +1006,19 @@
 msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "İptal Edildi..."
-
-#: ../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 ""
-"Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1152,7 +1159,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Bilgi İndiriliyor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1300,10 +1306,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 "Kaydet"
 
 #: ../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 "Şimdiki bilgiyi kaydet."
@@ -1358,10 +1364,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 "Farklı Kaydet..."
 
 #: ../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 "Varolan bilgileri yeni bir dosyaya kaydet."
@@ -1403,30 +1409,30 @@
 
 #: ../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 ""
 
-#: ../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 "Yolları Böl"
 
-#: ../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 "Seçili kavşakta yolu böl."
 
-#: ../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 "Yapılan seçim bölme için kullanılamaz."
 
-#: ../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."
 msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil."
 
-#: ../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 "
@@ -1438,19 +1444,19 @@
 msgstr[1] ""
 
-#: ../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 "seçili kavşaklar aynı yolu paylaşmıyorlar."
 
-#: ../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."
 msgstr[0] "Seçili yol seçili kavşakları içermiyor."
 
-#: ../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 "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz."
 
-#: ../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 "
@@ -1459,5 +1465,5 @@
 "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)"
 
-#: ../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 "
@@ -1465,5 +1471,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 "
@@ -1471,5 +1477,5 @@
 msgstr ""
 
-#: ../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"
@@ -1499,37 +1505,37 @@
 msgstr "Birçok yol tarafında kullanılan kavşakları çift yap."
 
-#: ../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 "Bu kavşak başka bir nesneye yapışık değil."
 
-#: ../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 "Kavşakların hiçbiri herhangi bir nesneye yapışık değil."
 
-#: ../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 "Yolların kavşakları herhangi nesneye yapışık değil."
 
-#: ../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 "Seçim çıkartmak için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Şunların Arasında Seçiniz:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../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 "* Birden fazla yol için kullanılan kavşak, veya"
 
-#: ../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 "* Birden fazla yol için veya şu yollardan biri için, veya"
 
-#: ../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"
@@ -1538,5 +1544,5 @@
 "kullanılabilir, veya"
 
-#: ../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."
@@ -1544,5 +1550,5 @@
 "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir."
 
-#: ../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"
@@ -1555,9 +1561,9 @@
 "kopyalarını oluşturur ve bütün kavşaklar seçilir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../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"
@@ -1565,5 +1571,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"
@@ -1604,12 +1610,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Server'dan gelen bilginin sınırlarını çiz ."
+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 ""
@@ -1625,6 +1630,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "seçimi değiştiriniz"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1638,10 +1644,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 "Seçili objeleri yapıştır alanına (buffer) kopyala."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "# Objeler"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1786,7 +1798,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "{0} Objeyi Değiştir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1908,9 +1920,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Bilgi İndiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1918,5 +1930,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 ""
@@ -1932,7 +1944,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Kullanıcının Adı."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1976,7 +1987,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "İndirirken çakışmalar oldu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1990,5 +2000,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
@@ -2021,6 +2031,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 "seçilmiş"
@@ -2038,26 +2048,26 @@
 msgstr "Yola kavşak ekle"
 
-#: ../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 "Varolan yolu kavşağa ekle"
 
-#: ../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 "Varolan yola kavaşka ekle"
 
-#: ../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 "Yola kavşak ekle ve birleştir"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -2066,47 +2076,46 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Genişlet"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Alanları Oluştur"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Yolu genişlet"
 
-#: ../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 "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız."
 
-#: ../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 "Dönmeyi durdurmak için fare düğmesini bırakınız."
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin."
 
@@ -2163,4 +2172,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2169,4 +2182,8 @@
 "Taşımayı durdurmak için fare düğmesini bırak. Ctrl ile en yakın kavşağa "
 "yapıştır."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2194,67 +2211,70 @@
 "sağzoom taşı ise sağ klik"
 
-#: ../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 "Ara..."
 
-#: ../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 "Objeleri ara."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "Lütfen bir aramametni giriniz."
 
-#: ../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 "ifade anlatımı"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "seçimi değiştiriniz"
 
-#: ../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 "seçime ekleyiniz"
 
-#: ../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 "Seçimden çıkartınız"
 
-#: ../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 "Harf hassas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "ifade anlatımı"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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>, "
@@ -2262,34 +2282,34 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../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-"
@@ -2297,43 +2317,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -2343,51 +2363,51 @@
 msgstr ""
 
-#: ../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 "Arama"
 
-#: ../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 ""
 
-#: ../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 "''{0}'' için herhangi karşılık bulunamadı"
 
-#: ../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 "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı."
 
-#: ../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 "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı"
 
-#: ../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} Eşleşme bulundu"
 
-#: ../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"
@@ -2556,6 +2576,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
@@ -2679,5 +2699,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 ""
@@ -2698,9 +2718,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 "parametre ''{0}'' zero (null) olamaz"
+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"
@@ -2736,5 +2759,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 "Yol segmentini ayrıştır"
@@ -2742,6 +2765,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."
@@ -2752,5 +2775,5 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2761,5 +2784,15 @@
 msgstr ""
 
-#: ../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"
@@ -2841,5 +2874,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"
@@ -2946,8 +2979,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
 msgid "Illegal double value ''{0}''"
-msgstr "Varsayılan değer ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
+#, java-format
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3127,5 +3166,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
@@ -3139,5 +3178,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 ""
@@ -3145,4 +3184,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 "not için eksik argüman."
+
+#: ../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 ""
 
@@ -3200,32 +3275,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Hata: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Uyarı: {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 ""
 
@@ -3250,45 +3326,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 "parametre ''{0}'' zero (null) olamaz"
+
+#: ../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
@@ -3299,6 +3358,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 ""
 
@@ -3309,145 +3369,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 "Alan stili yol kapalı değil."
 
-#: ../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 "multipoligon yolu ''{0}'' kapalı değil."
 
-#: ../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 "''{0}'' üyesini ilişkiden sil."
 
-#: ../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 "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+msgid "No \"from\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+msgid "No \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../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 ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
-msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
-msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
-msgid "No \"via\" node or way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
 
-#: ../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 "iç yol ''{0}'' dışarıda."
 
-#: ../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 "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#: ../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 "Yol-Değil ''{0}'' multipolygon içinde."
 
-#: ../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 "Multipoligon için dış yol yok ''{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 "İç yol stili ''{0}'' multipolygon ."
 
-#: ../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 "Dış yol stili ''{0}'' bulunamadı."
 
-#: ../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 "etiketsiz"
 
-#: ../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 "metin"
 
-#: ../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 "Hata: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Uyarı: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "durgun"
 
-#: ../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
@@ -3456,5 +3516,5 @@
 msgstr[0] "kavşak"
 
-#: ../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
@@ -3463,6 +3523,6 @@
 msgstr[0] "yol"
 
-#: ../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
@@ -3471,13 +3531,13 @@
 msgstr[0] "ilişki"
 
-#: ../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 "etiketsiz yol"
 
-#: ../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 "eksik yol"
 
-#: ../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
@@ -3485,5 +3545,5 @@
 msgstr "arkaplan"
 
-#: ../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 ""
@@ -3562,5 +3622,5 @@
 msgstr "Tekrar Gösterme"
 
-#: ../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
@@ -3568,32 +3628,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 "eksik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "Karayolu"
 
-#: ../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 "demiryolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "suyolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "arazi kullanımı"
 
-#: ../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"
@@ -3601,5 +3661,5 @@
 msgstr[0] "{0} Kavşak"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3607,33 +3667,33 @@
 msgstr[0] "{0} üye"
 
-#: ../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
@@ -3641,9 +3701,9 @@
 msgstr "Çelişki"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Tanımsız host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3863,5 +3923,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 "Düzenle"
@@ -3987,10 +4047,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 "tabaka listede yok."
 
-#: ../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"
@@ -4119,5 +4179,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"
@@ -4126,5 +4186,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"
@@ -4134,5 +4194,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 "Üyeler"
@@ -4561,5 +4621,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 ""
@@ -4617,6 +4677,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 ""
@@ -4745,4 +4803,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"
@@ -4839,5 +4898,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"
@@ -4847,5 +4906,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"
@@ -4885,7 +4944,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Bütün çakışmaları için yeni değerler gir."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4971,5 +5029,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
@@ -5063,5 +5121,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"
@@ -5117,11 +5175,11 @@
 msgstr "Seçili nesnelerin geçmişini göster."
 
-#: ../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
@@ -5129,13 +5187,13 @@
 msgstr "Yenile"
 
-#: ../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 "Reload all currently selected objects and refresh the list."
 
-#: ../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 ""
@@ -5192,12 +5250,12 @@
 
 #: ../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] "İşlem {0} objeyi değiştirecek."
 
 #: ../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 "Boş değer anahtarı sildi."
 
@@ -5221,4 +5279,10 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
+#: ../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] "İşlem {0} objeyi değiştirecek."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5295,60 +5359,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 "İlişkiler"
 
-#: ../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 "İlişkilerin listesini göster."
 
-#: ../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 "İlişkiler: {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 "Seçili ilişki için bir editör aç."
 
-#: ../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 "Seçili ilişkiyi sil"
 
-#: ../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 "Yeni ilişki oluştur"
 
-#: ../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 "Seçili ilişkiyi sil"
-
-#: ../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 "Şunların Arasında Seçiniz:"
-
-#: ../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 "Seçili ilişkiyi sil"
-
-#: ../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 "Üyeleri İndir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5503,5 +5563,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}"
@@ -5740,18 +5800,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 ""
@@ -5774,5 +5834,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}"
@@ -5854,12 +5914,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Alanları Oluştur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "Seçili üyeyi aşağı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5870,7 +5928,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 "Lütfen bu yer için bir isim giriniz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5880,12 +5937,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "Seçili üyeyi yukarı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "Seçili üyeyi yukarı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5943,7 +5998,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Seçili kavşakta yolu böl."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5952,7 +6006,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Seçili yol seçili kavşakları içermiyor."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5976,7 +6029,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "seçili GPX izi yok"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5993,12 +6045,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "Seçili üyeyi yukarı taşı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Editlemek için bir satır seçiniz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6014,7 +6064,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Aranacak yerin adını giriniz:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6028,12 +6077,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Ara..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Karaya doğru yön araması"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -6963,7 +7010,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "yakın"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7008,5 +7054,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 ""
@@ -7020,5 +7066,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 ""
@@ -7029,5 +7075,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 ""
@@ -7036,19 +7082,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 ""
@@ -7058,32 +7104,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 ""
@@ -7105,37 +7151,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 ""
@@ -7143,5 +7189,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 ""
@@ -7149,9 +7195,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 ""
@@ -7160,24 +7206,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 "parametre ''{0}'' zero (null) olamaz"
+
+#: ../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}"
@@ -7190,4 +7246,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Probleme Yaklaş"
+
+#: ../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 "tarih"
+
+#: ../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
@@ -7200,17 +7274,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 "kuzeydoğu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Kullanıcı"
 
-#: ../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 "bilinmeyen"
+
+#: ../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 "Anonymous"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7235,4 +7359,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 "Sürüm {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "silindi"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7577,8 +7716,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] "Düzenlenecek objeler:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7658,13 +7798,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
@@ -7731,5 +7871,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}..."
@@ -7741,5 +7881,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 Görüntüler"
@@ -7765,5 +7905,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"
@@ -7817,43 +7957,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 noktası"
 
 #: ../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 "Çizimi özelleştir"
 
 #: ../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 "Genel ayarları kullan."
 
 #: ../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 "Bu tabaka için çizgiler arasını birleştir."
 
 #: ../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 "Bu tabaka için çizgileri birleştirme."
 
 #: ../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 "Çizim seçeneklerini seçiniz"
 
 #: ../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 "Renkleri Ayarla"
 
 #: ../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"
@@ -7861,6 +8001,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"
@@ -7948,10 +8088,10 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../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 "Bilgi tabakasına çevir"
 
-#: ../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."
@@ -7961,43 +8101,43 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../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 "Çevrildiği yer: {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 "OSM den bu izi indir"
 
-#: ../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 "Bunun içindeki herşeyi indir:"
 
-#: ../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} metre"
 
-#: ../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 "Her istek için max. alan:"
 
-#: ../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 ""
@@ -8008,9 +8148,9 @@
 "istiyor musunuz?</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 "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../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 "
@@ -8018,5 +8158,5 @@
 msgstr ""
 
-#: ../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 "
@@ -8060,4 +8200,5 @@
 "server."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8070,4 +8211,5 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
@@ -8075,32 +8217,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} silindi.)"
-
-#: ../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} şunları içerir:"
 
-#: ../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 ""
 
-#: ../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 "GPX tabakasına çevir"
 
-#: ../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."
@@ -8108,5 +8251,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"
@@ -8115,10 +8258,10 @@
 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"
 msgstr[0] "nokta"
 
-#: ../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"
@@ -8126,5 +8269,5 @@
 msgstr[0] "{0} noktalı iz"
 
-#: ../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"
@@ -8132,5 +8275,5 @@
 msgstr[0] "{0} {1} izden oluşur"
 
-#: ../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"
@@ -8138,14 +8281,14 @@
 msgstr[0] "{0} nokta"
 
-#: ../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 imleçi"
 
-#: ../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"
 msgstr[0] "imleç"
 
-#: ../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"
@@ -8153,14 +8296,14 @@
 msgstr[0] "{0} {1} imleçten oluşur"
 
-#: ../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 "Sesi Eşle"
 
-#: ../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 "Eşlemeye yardımcı bir ses duyduğunuzda, çalan sesi durdurunuz."
 
-#: ../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
@@ -8168,14 +8311,14 @@
 msgstr "Ses {0} noktasında eşlendi."
 
-#: ../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 "Çalan tabakada eşleme yapılamadı."
 
-#: ../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 "Ses dosyasının başlangıcını işaretle"
 
-#: ../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 "
@@ -8183,13 +8326,13 @@
 msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
 
-#: ../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 "Sesi işaretleyecek herhangi bir nesne yok."
 
-#: ../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 "Göster/Sakla Metin/İkon"
 
-#: ../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 "Görünen metin ve ikonları sabitle."
@@ -8255,5 +8398,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 "Editlemek için bir satır seçiniz."
@@ -8267,5 +8410,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."
@@ -8983,12 +9126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "Seçili kaynağı listeden sil."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "Seçili anahtarın değerini her obje için düzenle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9002,17 +9143,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Yorum Ekle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "Seçim listesini yenile."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "Seçili kaynağı kontrol et."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9642,5 +9780,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}''."
@@ -9667,5 +9805,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}."
@@ -9673,5 +9811,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}"
@@ -9684,5 +9822,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}''."
@@ -9833,5 +9971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9840,38 +9978,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 ""
@@ -9879,19 +10017,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 "Ref=0, eksik <member> tanımı."
 
-#: ../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 "Geçersiz obje bulundu 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 ""
@@ -9902,9 +10040,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 ""
@@ -9914,25 +10052,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 ""
@@ -9940,5 +10078,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9947,5 +10085,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9953,5 +10091,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9960,13 +10098,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 ""
 
-#: ../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 ""
@@ -10118,8 +10256,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} Eklenti güncelledi. Programı yeniden açınız."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10181,7 +10320,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Eklentileri Güncelle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10322,35 +10460,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 "bilinmeyen"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10973,47 +11080,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 "EXIF den GPS verisi çıkartılıyor"
 
-#: ../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 "klasör arama başladı"
 
-#: ../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 "Seçilen yollardan birisi null !!!"
-
-#: ../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ğraflar okunuyor..."
 
-#: ../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 "Kananoik yol klasör için bulunamadı {0}\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 "Klasör aranıyor {0}"
 
-#: ../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 "Klasörde null dosya bulundu {0}\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 "Klasörden dosya alınmasında hata oluştu {0}\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 "GPX e göre ilişkilendir"
 
-#: ../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."
@@ -11029,24 +11135,24 @@
 msgstr "Görüntü kümesini yeni bir tabaka olarak kaydet."
 
-#: ../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 Dosyaları (*.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 "{0} Dosyası \"{1}\" ismi ile yüklendi"
 
-#: ../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 "Ayrıştırma sırasında hata {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 "Okunamadı \"{0}\""
 
-#: ../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."
@@ -11058,34 +11164,34 @@
 "seçiniz<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 "Fotoğraf zamanı (exif den):"
 
-#: ../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 zamanı (fotoğraftan okundu): "
 
-#: ../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 " [gg/aa/yyyy sa:dk:sn]"
 
-#: ../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 "Şu zaman dilimindeyim: "
 
-#: ../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 "Tarih Yok"
 
-#: ../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 "Başka bir fotoğraf aç"
 
-#: ../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 "GPS receiver ile Fotoğrafın zamanını eşitle"
 
-#: ../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"
@@ -11095,69 +11201,69 @@
 "Lütfen istenen formatı kullanın"
 
-#: ../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 "Geçersiz Tarih"
 
-#: ../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 "<GPX izi yüklenmedi>"
 
-#: ../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 izi: "
 
-#: ../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 "Başka GPX izi aç"
 
-#: ../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 "Zamandilimi: "
 
-#: ../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 "Offset:"
 
-#: ../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>GPS alıcımın resmini çizebilirim.<br>yardımcı olurmu?</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 "Burası için pozisyon güncelle: "
 
-#: ../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 "Bütün imajlar"
 
-#: ../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 "exif pozisyonu olmayan imajlar"
 
-#: ../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 "imaj henuz etiketlenmedi"
 
-#: ../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 "imaj ile GPX izini ilişkilendir"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "GPX izi seçmelisiniz"
 
-#: ../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 "seçili GPX izi yok"
 
-#: ../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 ""
@@ -11168,9 +11274,9 @@
 "İstenen format: {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 "Geçersiz zaman dilimi"
 
-#: ../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 ""
@@ -11181,65 +11287,65 @@
 "İstenen format: {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 "Geçersiz offset"
 
-#: ../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 ""
 
-#: ../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 izi yüklendi"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
-msgid "Timezone: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
-#, java-format
-msgid "Minutes: {0}"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:780
-#, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11247,13 +11353,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -11274,5 +11380,5 @@
 msgstr "Dosyada Hata {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11285,37 +11391,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 "Dosya Yüklemede Sorun"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11327,18 +11433,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr ""
@@ -11365,34 +11471,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
@@ -11404,18 +11510,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr ""
 
-#: ../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 "
@@ -11423,5 +11529,5 @@
 msgstr ""
 
-#: ../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). "
@@ -11429,74 +11535,74 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr ""
 
-#: ../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"
@@ -11504,30 +11610,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr ""
 
-#: ../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"
@@ -11535,29 +11641,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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -11566,13 +11672,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"
@@ -11580,5 +11686,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"
@@ -11586,14 +11692,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"
@@ -11601,14 +11707,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"
@@ -11616,64 +11722,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -11681,25 +11787,25 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -11708,14 +11814,14 @@
 msgstr[0] "Yolu Basitleştir ({0} nokta kaldır)"
 
-#: ../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 ayarla"
 
-#: ../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"
@@ -11723,5 +11829,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
@@ -11729,5 +11835,5 @@
 msgstr "WMS mozaiği indir {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"
@@ -11735,34 +11841,34 @@
 msgstr ""
 
-#: ../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 "Boş Tabaka"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11771,18 +11877,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11889,9 +11995,9 @@
 msgstr "Çiftli yol oluştur"
 
-#: ../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 ""
@@ -11908,11 +12014,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 "Yolu GPX tabakasından içeri al"
 
 #: ../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 "Var olan yolu iptal et"
@@ -11922,5 +12028,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 "GPX veri tabaksı bulunamadı."
@@ -12132,5 +12238,5 @@
 msgstr "Gotag yapılmamış görüntüleri göster"
 
-#: ../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 "İçeri alınan görüntüler"
@@ -12561,5 +12667,5 @@
 msgstr "Seçili iki kavşak arası açı"
 
-#: ../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 "Ölçüm tabakası"
@@ -12638,5 +12744,5 @@
 msgstr "OpenStreet Hata indirme döngüsü"
 
-#: ../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 "OpenStreet hatalarını göster"
@@ -12773,7 +12879,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "Tabaka"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12939,43 +13044,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 "Hareketli Harita"
 
-#: ../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 "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 "Mozaik Yükle"
 
-#: ../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 "Mozaik Durumunu Göster"
-
-#: ../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 "Bütün Mozaikleri Yükle"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
@@ -13011,7 +13114,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "zoom seviyesi"
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13358,6 +13460,6 @@
 msgstr "Emin misiniz?"
 
-#: ../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
@@ -13365,5 +13467,5 @@
 msgstr "Onaylama Hataları"
 
-#: ../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 "Onaylama hatası yok"
@@ -13453,5 +13555,5 @@
 msgstr "Diğerlerini Onayla"
 
-#: ../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}"
@@ -13551,7 +13653,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Sırasız sahil çizgisi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13581,18 +13682,18 @@
 msgstr "kesişine yollar"
 
-#: ../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 "Çift Noktalar"
 
-#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
 
-#: ../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 ""
@@ -13748,60 +13849,60 @@
 #. 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 "Renklendirme problemi"
 
-#: ../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 "Anhatar ''{0}'' geçersiz ."
 
-#: ../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 "Boş değerli etiketler"
 
-#: ../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 "Geçersiz özellik anahtar"
 
-#: ../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 "Özellik anahtarında geçersiz -boşluk- karakteri"
 
-#: ../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 "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor"
 
-#: ../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 "Özellik anahtarı HTML bilgisi içeriyor"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Beni Düzelt!"
 
-#: ../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 "Özellik anahtarını kontrol et."
 
-#: ../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 ""
@@ -13809,22 +13910,22 @@
 "kontrol eder."
 
-#: ../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 "Karışık özellik kontrolu kullan."
 
-#: ../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 ""
 "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et."
 
-#: ../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 "Etiket kontrolcusu kaynağı"
 
-#: ../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."
@@ -13833,86 +13934,86 @@
 "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası"
 
-#: ../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 "Listeye yeni bir kaynak ekle."
 
-#: ../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 "Seçili kaynağı kontrol et."
 
-#: ../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 "Seçili kaynağı listeden sil."
 
-#: ../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 "Veri kaynakları"
 
-#: ../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 "Özellik değerlerini kontrol et."
 
-#: ../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 "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et."
 
-#: ../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 "Beni Düzelt! leri kontrol et."
 
-#: ../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 "Beni Düzelt! değeri içeren yol veya noktalara bak."
 
-#: ../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 "Renklendirme notlarını kontro let."
 
-#: ../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 "Harita renklendirme hata durumunu kontrol et."
 
-#: ../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 "Varsayılan veri dosyasını kontrol et."
 
-#: ../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 "Varsayılan veri dosyasını kontrol et (önerilen)."
 
-#: ../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 "Varsayılan imla dosyasını kontrol et."
 
-#: ../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 "Varsayılan imla dosyasını kontrol et (önerilen)."
 
-#: ../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 "Özellikler Düzelt"
 
-#: ../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 "Eleman tipi bulunamadı"
 
-#: ../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 "Uyarı seviyesi bulunamadı"
 
-#: ../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 "Hatalı söylem ''{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}''"
@@ -14088,17 +14189,17 @@
 "Bu test bir yolun son noktasının yakınında başka yol varmı kontrolunu yapar."
 
-#: ../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 "Yolun sonunda başka karayolu var"
 
-#: ../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 "Yolun sonunda başka yol var"
 
-#: ../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 "Yolun sonunda başka yol var"
 
-#: ../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 "Bağlı yolun sonuda başka yol var"
@@ -14150,13 +14251,13 @@
 msgstr "Bu test su, yer ve sahilçizgisi yönünü kontrol eder."
 
-#: ../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 "Ters çizilmiş sahil çizgisi: kara solda değil"
 
-#: ../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 "Ters çizilmiş su yolu: kara solda değil"
 
-#: ../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 "Ters çizilmiş yer: kara solda değil"
@@ -14192,7 +14293,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 tabakası ({0}), görüntü seviyesi {1}"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14200,18 +14301,60 @@
 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 "İndir"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Harita verisi OSM sunucusundan indir."
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "Çift noktalar kaldırılıyor..."
+
+#: ../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 ""
 
@@ -14219,43 +14362,4 @@
 msgid "Exception occurred"
 msgstr "İstisna oluştu"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "yardım"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Yardım / Hakkında"
-
-#: ../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 Eklenti Yardımı"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14357,28 +14461,28 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Otomatik indir"
 
-#: ../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 tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../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 tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14389,13 +14493,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"
@@ -14404,42 +14508,42 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../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 tabakasını dosyaya kaydet"
 
-#: ../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 tabakasını dosyadan yükle"
 
-#: ../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 "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
@@ -18865,14 +18969,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Arkeolojik Site"
+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 "Arkeolojik Site Düzenle"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26841,39 +26943,42 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Dosya bulunamadı."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Lütfen en az bir indirme görevi seçiniz"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "İlişkilerde Karışıklık"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Ayrıştırma esnasında hata"
-
-#~ msgid "File not found"
-#~ msgstr "Dosya bulunamadı"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Lütfen aranacak bir metin giriniz"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Arama sonucu server dan alınamadı"
-
-#~ msgid "name"
-#~ msgstr "sism"
-
-#~ msgid "zoom"
-#~ msgstr "yaklaş"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Kopyalamak için bir satır seçiniz."
+#~ msgid "help"
+#~ msgstr "yardım"
+
+#~ msgid "Help / About"
+#~ msgstr "Yardım / Hakkında"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "WMS Eklenti Yardımı"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra "
+#~ "yapınız."
+
+#~ msgid "Unknown version"
+#~ msgstr "Bilinmeyen versiyon"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-bileşene erişelemdi."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> in içi boş"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>. eleman ile bağlantı bulunamadı."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Yanlış tanımlı kavşak bilgisi"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
 
 #~ msgid ""
@@ -26884,48 +26989,12 @@
 #~ "değiştirebilirsin.<br>"
 
-#~ msgid "Request Update"
-#~ msgstr "Güncelleme İste"
-
-#~ msgid "error loading metadata"
-#~ msgstr "meta veri yüklemesinde hata"
-
-#~ msgid "requested: {0}"
-#~ msgstr "istendi: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "güncelleme isteğinde hata"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra "
-#~ "yapınız."
-
-#~ msgid "Unknown version"
-#~ msgstr "Bilinmeyen versiyon"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-bileşene erişelemdi."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> in içi boş"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>. eleman ile bağlantı bulunamadı."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Yanlış tanımlı kavşak bilgisi"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
-
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi."
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -26981,4 +27050,7 @@
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Çeşişkiler: {0}"
+
+#~ msgid "name"
+#~ msgstr "sism"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -27046,4 +27118,10 @@
 #~ msgstr "onların versiyonu:"
 
+#~ msgid "Error while parsing"
+#~ msgstr "Ayrıştırma esnasında hata"
+
+#~ msgid "File not found"
+#~ msgstr "Dosya bulunamadı"
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Eklenti indirilemedi: {0} ve {1}"
@@ -27060,4 +27138,7 @@
 #~ msgid "Delete {1} {0}"
 #~ msgstr "Sil {1} {0}"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "İlişkilerde Karışıklık"
 
 #~ msgid "true"
@@ -27098,4 +27179,7 @@
 #~ msgstr "Elemanın Geçmişi"
 
+#~ msgid "File could not be found."
+#~ msgstr "Dosya bulunamadı."
+
 #~ msgid ""
 #~ "The selected ways have differing relation memberships.  Do you still want "
@@ -27145,4 +27229,7 @@
 #~ msgstr "Bilgi Tabakası"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Lütfen en az bir indirme görevi seçiniz"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Gerçekten  ''yapılmış'' olarak işaretlemek istiyormusunuz?"
@@ -27151,4 +27238,13 @@
 #~ msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Lütfen aranacak bir metin giriniz"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Arama sonucu server dan alınamadı"
+
+#~ msgid "zoom"
+#~ msgstr "yaklaş"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "TCX Dosyası içeri al..."
@@ -27163,4 +27259,16 @@
 #~ msgstr "Aktif seçimi veya bütün veriyi onayla."
 
+#~ msgid "Request Update"
+#~ msgstr "Güncelleme İste"
+
+#~ msgid "error loading metadata"
+#~ msgstr "meta veri yüklemesinde hata"
+
+#~ msgid "requested: {0}"
+#~ msgstr "istendi: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "güncelleme isteğinde hata"
+
 #~ msgid "Show Author Panel"
 #~ msgstr "Yazar Panosunu göster"
@@ -27195,4 +27303,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier id={0}"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Kopyalamak için bir satır seçiniz."
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 18508)
+++ applications/editors/josm/i18n/po/zh_TW.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:38+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 13:58+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:20+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -48,18 +48,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
@@ -69,6 +69,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
@@ -76,11 +75,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
@@ -95,4 +94,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"
@@ -119,6 +119,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
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -171,12 +171,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
@@ -188,6 +188,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 "錯誤"
@@ -208,6 +209,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"
@@ -313,5 +314,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
@@ -329,6 +330,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
@@ -339,5 +340,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
@@ -456,5 +457,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
@@ -496,5 +497,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
@@ -503,6 +504,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"
@@ -684,5 +686,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
@@ -695,5 +697,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"
@@ -765,5 +767,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
@@ -771,28 +781,28 @@
 msgstr ""
 
-#: ../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 "匯入時有 {0} 個衝突。"
 
-#: ../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}"
@@ -829,10 +839,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 "匯出到 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 "匯出資料到 GPX 檔案"
@@ -845,11 +855,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
@@ -880,5 +889,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
@@ -893,17 +901,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
@@ -963,5 +972,5 @@
 msgstr "將節點連結到最近的路徑區段"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "連結節點與直線"
@@ -992,20 +1001,19 @@
 msgstr "請至少選取兩個節點來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "正在中止..."
-
-#: ../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 "不能合併節點。會刪除仍在使用的路徑。"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1146,7 +1154,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "正在下載資料"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1293,10 +1300,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 "存檔"
 
 #: ../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 "儲存現在的資料"
@@ -1351,10 +1358,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 "另存檔案..."
 
 #: ../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 "將目前的資料儲存為新的檔案。"
@@ -1394,30 +1401,30 @@
 
 #: ../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 "關閉"
 
-#: ../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 "切割路徑"
 
-#: ../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 "在選取的節點上切割路徑"
 
-#: ../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 "不能在選取的節點上切割路徑"
 
-#: ../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."
 msgstr[0] "選取的節點不在任何路徑上"
 
-#: ../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 "
@@ -1428,19 +1435,19 @@
 msgstr[0] "節點上不只有兩個路徑。請同時選取你想切割的路徑。"
 
-#: ../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 "選取的節點不在同一個路徑上。"
 
-#: ../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."
 msgstr[0] "選取的路徑未包含選取的節點。"
 
-#: ../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 "你必須選擇兩個以上的節點來切割一個環狀路徑"
 
-#: ../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 "
@@ -1448,5 +1455,5 @@
 msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）"
 
-#: ../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 "
@@ -1454,5 +1461,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 "
@@ -1460,5 +1467,5 @@
 msgstr ""
 
-#: ../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"
@@ -1488,47 +1495,47 @@
 msgstr "重製由多條路徑使用的節點。"
 
-#: ../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 "這個節點並未黏合到其他項目上。"
 
-#: ../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 "這些節點沒有一個黏合到其他項目上。"
 
-#: ../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 "這個路徑的節點沒有一個黏合到其他項目上。"
 
-#: ../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 "目前的選擇區域不能用於取消黏合。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "選擇其一："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* 一個有標籤的節點，或"
 
-#: ../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 "* 一個用於多條路徑的節點，或"
 
-#: ../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 "* 一個用於多條路徑或用於那些路徑之一的節點，或"
 
-#: ../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"
 msgstr "* 一個有一或更多節點用於多條路徑的路徑，或"
 
-#: ../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."
 msgstr "* 一個路徑且其一或多個節點用於多條路徑。"
 
-#: ../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"
@@ -1541,9 +1548,9 @@
 "都會被選取。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "取消黏合節點"
 
-#: ../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"
@@ -1551,5 +1558,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"
@@ -1590,12 +1597,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "繪出從伺服器下載資料的邊界。"
+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 ""
@@ -1611,6 +1617,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
-msgstr ""
+#, fuzzy
+msgid "Update selection"
+msgstr "更新選擇區域"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
@@ -1624,10 +1631,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 "複製選取的物件到剪貼簿"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "選擇區域是空的"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "更新選擇區域"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1775,7 +1788,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "改變 {0} 個物件"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1897,9 +1910,9 @@
 msgstr "已下載的 GPX 資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "正在下載資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1907,5 +1920,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 ""
@@ -1921,7 +1934,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "可視的（在伺服器上）"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -1937,7 +1949,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
-#, fuzzy
 msgid "Click to abort and to resume editing"
-msgstr "按這裡刪除目的地。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -1966,7 +1977,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "下載時發生錯誤"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1980,5 +1990,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
@@ -2011,6 +2021,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 "已選取"
@@ -2028,26 +2038,26 @@
 msgstr "將節點加入路徑"
 
-#: ../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 "將既存的路徑連接到節點"
 
-#: ../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 "在既存的路徑加入新的節點"
 
-#: ../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 "將節點加入路徑並連接"
 
-#: ../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 "建立新的節點。"
 
-#: ../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 "選取游標下的節點。"
 
-#: ../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."
@@ -2055,46 +2065,44 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../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 "從最後的節點開始新的路徑。"
 
-#: ../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 "從最後的節點繼續路徑。"
 
-#: ../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 "結束繪製。"
 
-#: ../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 "推出"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "建立區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "推出路徑"
 
-#: ../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 "放開滑鼠按鈕以選擇矩形內的物件。"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。"
 
-#: ../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 "放開滑鼠按鈕以停止旋轉。"
-
-#: ../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:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "拖曳路徑區段以產生矩形。"
 
@@ -2149,8 +2157,16 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "放開滑鼠按鈕以停止旋轉。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2180,67 +2196,70 @@
 "動縮放"
 
-#: ../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 "搜尋..."
 
-#: ../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 "搜尋物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../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 "請輸入搜尋字串。"
 
-#: ../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 "正規表示式"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "取代選擇區域"
 
-#: ../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 "加入至選擇區域"
 
-#: ../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 "從選擇區域移除"
 
-#: ../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 "區分大小寫"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "正規表示式"
 
-#: ../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>Baker Street</b> - 「Baker」和「Street」出現在何設定鍵或名稱中。"
 
-#: ../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>\"Baker Street\"</b> -  「Baker Street」出現在何設定鍵或名稱中。"
 
-#: ../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:Bak</b> - 「Bak」出現在名稱中的任何地方。"
 
-#: ../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> - 含有設定鍵「type」為「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>, "
@@ -2250,17 +2269,17 @@
 "<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:Bak</b> - 名稱中沒有「Bak」。"
 
-#: ../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> - key=foot 設定為任何數值。"
 
-#: ../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>特殊的目標：</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>)"
@@ -2269,62 +2288,61 @@
 "(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>使用者：</b>... - 所有由某使用者改變的物件"
 
-#: ../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>節點數：</b>... - 含有此數目節點的物件"
 
-#: ../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>節點數：</b>... - 含有此數目節點的物件"
-
-#: ../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>修改過</b> - 所有改變過的物件"
 
-#: ../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>選取的</b> - 所有選取的物件"
 
-#: ../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>不完整</b> - 所有不完整的物件"
 
-#: ../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>未標籤的</b> - 所有未標籤的物件"
 
-#: ../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 "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
 
-#: ../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 "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
 
-#: ../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 "使用 <b>|</b> 或 <b>OR</b> 做邏輯或運算"
 
-#: ../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 "使用 <b>\"</b> 將運算子包覆 (例如當設定鍵含有 :)"
 
-#: ../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 "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
 
-#: ../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
@@ -2334,51 +2352,51 @@
 msgstr "過濾條件"
 
-#: ../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 "搜尋"
 
-#: ../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 "開始搜尋"
 
-#: ../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 "找不到「{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 "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
 
-#: ../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 "搜尋「{0}」的結果沒有任何項目可自選擇區域移除"
 
-#: ../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} 個符合項"
 
-#: ../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"
@@ -2427,16 +2445,13 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
-#, fuzzy
 msgid "Wrong number of parameters for tags operator."
-msgstr "給 nodes 運算子錯誤的參數數量。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
-"nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 "
-"nodes:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -2552,6 +2567,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
@@ -2675,5 +2690,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 ""
@@ -2694,9 +2709,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 "參數「{0}」必須不為空值(null)"
+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"
@@ -2732,5 +2750,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 "分割路徑區段"
@@ -2738,6 +2756,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."
@@ -2748,5 +2766,5 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2757,5 +2775,15 @@
 msgstr "解決 {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"
@@ -2837,5 +2865,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"
@@ -2942,8 +2970,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 "預設值是「{0}」。"
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "參數「{0}」應為 > 0，得到「{1}」"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3123,5 +3157,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
@@ -3135,5 +3169,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 ""
@@ -3141,4 +3175,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 "沒有 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 ""
 
@@ -3196,32 +3266,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "錯誤：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "警告：{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 ""
 
@@ -3246,45 +3317,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 "在這個歷史紀錄日期「{0}」沒有有效的版本"
-
-#: ../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 "參數「{0}」應為 > 0，得到「{1}」"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../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
@@ -3295,6 +3349,7 @@
 msgstr "參數「{0}」應為 > 0，得到「{1}」"
 
-#: ../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 ""
 
@@ -3305,145 +3360,145 @@
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../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 "區域類型的路徑並未封閉。"
 
-#: ../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 "多邊形路徑「{0}」並未封閉。"
 
-#: ../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 "關係中已刪除的成員「{0}」。"
 
-#: ../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 "路徑「{0}」少於兩個節點。"
 
-#: ../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 "找到一個以上「從」路徑。"
 
-#: ../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 "找到一個以上「到」路徑。"
 
-#: ../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 "找到一個以上的「經過」。"
 
-#: ../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 "不明的角色「{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 "「{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 "找不到「從」路徑。"
 
-#: ../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 "找不到「到」路徑。"
 
-#: ../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 "找到一個以上「經過」路徑。"
 
-#: ../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 "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../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 "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../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 "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../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 "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../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 "找不到限制 {0} 的樣式"
 
-#: ../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 "路徑「{0}」和「{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 "內部路徑「{0}」在外。"
 
-#: ../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 "路徑「{1}」沒有有用的角色「{0}」。"
 
-#: ../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 "多邊形中有非-路徑「{0}」。"
 
-#: ../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 "多邊形「{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 "內部路徑「{0}」的樣式等同多邊形。"
 
-#: ../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 "外部路徑「{0}」的樣式不符。"
 
-#: ../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 "未上標籤的"
 
-#: ../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 "文字"
 
-#: ../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 "錯誤：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "警告：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "不使用"
 
-#: ../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
@@ -3452,5 +3507,5 @@
 msgstr[0] "節點"
 
-#: ../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
@@ -3459,6 +3514,6 @@
 msgstr[0] "路徑"
 
-#: ../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
@@ -3467,13 +3522,13 @@
 msgstr[0] "關係"
 
-#: ../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 "未上標籤的路徑"
 
-#: ../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 "不完整的路徑"
 
-#: ../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
@@ -3481,5 +3536,5 @@
 msgstr "背景"
 
-#: ../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 "突顯"
@@ -3563,5 +3618,5 @@
 msgstr "不再顯示"
 
-#: ../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
@@ -3569,32 +3624,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 "不完整"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "公路"
 
-#: ../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 "鐵路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "航道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../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"
@@ -3602,5 +3657,5 @@
 msgstr[0] "{0} 節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3608,33 +3663,33 @@
 msgstr[0] "{0} 成員"
 
-#: ../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
@@ -3642,9 +3697,9 @@
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3666,7 +3721,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "關閉這個對話盒"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3862,5 +3916,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 "編輯"
@@ -3986,10 +4040,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 "圖層不在清單中。"
 
-#: ../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"
@@ -3997,7 +4051,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
-#, fuzzy
 msgid "Click to cancel the current operation"
-msgstr "不，取消操作"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4119,5 +4172,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"
@@ -4126,5 +4179,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"
@@ -4134,5 +4187,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 "成員"
@@ -4560,5 +4613,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 "否，中止"
@@ -4616,6 +4669,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 "<未定義的>"
@@ -4744,4 +4795,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"
@@ -4838,5 +4890,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"
@@ -4846,5 +4898,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"
@@ -4884,7 +4936,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "輸入所有衝突項目的數值。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -4970,5 +5021,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
@@ -5062,5 +5113,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"
@@ -5116,11 +5167,11 @@
 msgstr "顯示所有選取的項目歷史紀錄。"
 
-#: ../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
@@ -5128,13 +5179,13 @@
 msgstr "重新載入"
 
-#: ../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 "重新載入所有目前的物件並重新整理清單。"
 
-#: ../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 ""
@@ -5191,12 +5242,12 @@
 
 #: ../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] "這會改變 {0} 個物件。"
 
 #: ../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 "空白的數值會刪除該設定鍵。"
 
@@ -5220,4 +5271,10 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
+#: ../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] "這會改變 {0} 個物件。"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5294,60 +5351,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 "關係"
 
-#: ../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 "開啓所有關係的清單。"
 
-#: ../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 "關係：{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 "開啓選取的關係編輯器"
 
-#: ../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 "刪除選取的關係"
 
-#: ../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 "建立新的關係"
 
-#: ../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 "刪除選取的關係"
-
-#: ../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 "選擇其一："
-
-#: ../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 "刪除選取的關係"
-
-#: ../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 "下載成員"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5502,5 +5555,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}"
@@ -5739,18 +5792,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 ""
@@ -5773,5 +5826,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}"
@@ -5853,12 +5906,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "建立邊界"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "將目前選取的成員下移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5869,7 +5920,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 "請輸入此位置的名稱。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5879,12 +5929,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "將目前選取的成員上移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "將目前選取的成員上移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -5942,7 +5990,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "在選取的節點上切割路徑"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -5951,7 +5998,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "選取的路徑未包含選取的節點。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -5975,7 +6021,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "尚未選取關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -5992,12 +6037,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "將目前選取的成員上移"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "請選擇要編輯的列。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6013,7 +6056,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "輸入要搜尋位置的名稱："
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6027,12 +6069,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "搜尋..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "搜尋陸地的方向"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -6962,7 +7002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "靠近"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7007,5 +7046,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 ""
@@ -7019,5 +7058,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 ""
@@ -7028,5 +7067,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 ""
@@ -7035,19 +7074,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 ""
@@ -7057,32 +7096,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 ""
@@ -7104,37 +7143,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 ""
@@ -7142,5 +7181,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 ""
@@ -7148,9 +7187,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 ""
@@ -7159,24 +7198,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 "參數「{0}」應為 > 0，得到「{1}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, fuzzy, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr "參數「{0}」應為 > 0，得到「{1}」"
+
+#: ../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}"
@@ -7189,4 +7238,22 @@
 msgstr "節點 {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "縮放至問題點"
+
+#: ../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 "載入歷史紀錄"
+
+#: ../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
@@ -7199,17 +7266,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 "排序預設組合選單"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "使用者"
 
-#: ../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 "不明"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, fuzzy, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
+
+#: ../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 "匿名"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7234,4 +7351,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr "版本 {0} 由 {2} 建立於 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "已刪除"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, fuzzy, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr "版本 {0} 由 {2} 建立於 {1}"
 
@@ -7576,8 +7708,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] "要編輯的物件："
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7657,13 +7790,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
@@ -7730,5 +7863,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}..."
@@ -7740,5 +7873,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 "有 Geotag 的圖片"
@@ -7764,5 +7897,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"
@@ -7816,43 +7949,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 點"
 
 #: ../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 "自訂線條的繪製"
 
 #: ../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 "使用全域設定值。"
 
 #: ../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 "在這個圖層的各點之間繪出線條。"
 
 #: ../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 "在這個圖層的各點之間不要繪出線條。"
 
 #: ../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 "選擇線條繪製選項"
 
 #: ../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 "自訂顏色"
 
 #: ../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"
@@ -7860,6 +7993,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"
@@ -7947,10 +8080,10 @@
 msgstr[0] "{0} 航點"
 
-#: ../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 "轉換為資料圖層"
 
-#: ../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."
@@ -7960,43 +8093,43 @@
 "軌跡，請看這裡："
 
-#: ../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 "轉換自：{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 "從 OSM 沿這條軌跡下載"
 
-#: ../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 "下載這裡面的每個物件："
 
-#: ../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} 公尺"
 
-#: ../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 "每個要求最大區域："
 
-#: ../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} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8006,9 +8139,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</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 "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../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 "
@@ -8016,5 +8149,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../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 "
@@ -8057,4 +8190,5 @@
 "server."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
@@ -8067,4 +8201,5 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
@@ -8072,32 +8207,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+#: ../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} 已刪除。)"
-
-#: ../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} 組成："
 
-#: ../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 版本： {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 "轉換為 GPX 圖層"
 
-#: ../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."
@@ -8105,5 +8241,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"
@@ -8112,10 +8248,10 @@
 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"
 msgstr[0] "點"
 
-#: ../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"
@@ -8123,5 +8259,5 @@
 msgstr[0] "有 {0} 個點的軌跡"
 
-#: ../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"
@@ -8129,5 +8265,5 @@
 msgstr[0] "{0} 由 {1} 軌跡組成"
 
-#: ../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"
@@ -8135,14 +8271,14 @@
 msgstr[0] "{0} 點"
 
-#: ../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 標記"
 
-#: ../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"
 msgstr[0] "標記"
 
-#: ../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"
@@ -8150,14 +8286,14 @@
 msgstr[0] "{0} 由 {1} 標記組成"
 
-#: ../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 "同步音效"
 
-#: ../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 "當您在聆聽同步隊列時需要暫停音效。"
 
-#: ../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
@@ -8165,14 +8301,14 @@
 msgstr "音效同步於點 {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 "在播放時無法於圖層同步。"
 
-#: ../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 ""
 
-#: ../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 "
@@ -8180,13 +8316,13 @@
 msgstr "您需要在軌跡上想標記的點暫停音效。"
 
-#: ../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 "這個圖層中沒有既存的音效標記可位移。"
 
-#: ../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 "顯示/隱藏文字/圖示"
 
-#: ../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 "切換標記文字和圖示的可見性狀態。"
@@ -8250,5 +8386,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 "請選擇要編輯的列。"
@@ -8262,5 +8398,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."
@@ -8972,17 +9108,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "從合併元件的清單移除選取的項目"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "編輯所有物件選取設定鍵的數值"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
-#, fuzzy
 msgid "Add the selected available styles to the list of active styles"
-msgstr "從合併元件的清單移除選取的項目"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
@@ -8992,17 +9125,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "加入新的圖層"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "重新整理選擇區域清單。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "編輯選取的來源。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
@@ -9623,5 +9753,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}''."
@@ -9648,5 +9778,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}."
@@ -9654,5 +9784,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}"
@@ -9665,5 +9795,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}''."
@@ -9816,5 +9946,5 @@
 msgstr "檔案「{0}」不存在"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9823,38 +9953,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 ""
@@ -9862,19 +9992,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 "不完整的 <member>> 規格，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 "不合法的物件，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 ""
@@ -9885,9 +10015,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 ""
@@ -9897,25 +10027,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 ""
@@ -9923,5 +10053,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -9930,5 +10060,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -9936,5 +10066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -9943,13 +10073,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 資料..."
 
-#: ../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 ""
@@ -10099,8 +10229,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} 個外掛程式。請重新啟動 JOSM。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10162,7 +10293,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "更新外掛程式"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10298,35 +10428,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 "不明"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -10947,47 +11046,46 @@
 "{0} 公里/小時"
 
-#: ../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 "從 EXIF 中解出 GPS 位置"
 
-#: ../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 "開始掃描目錄"
 
-#: ../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 "選取的檔案其中之一是空的！！！"
-
-#: ../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 "讀取相片..."
 
-#: ../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 "無法取得目錄  {0} 的路徑\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 "正在掃描目錄 {0}"
 
-#: ../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 "在目錄 {0} 找到空的檔案\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 "從目錄 {0} 取得檔案時發生錯誤\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 "關聯到 GPX"
 
-#: ../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."
@@ -11003,24 +11101,24 @@
 msgstr "將多組圖片載入為新的圖層。"
 
-#: ../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 檔案 (*.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 "檔案 {0} 已經以「{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 "當解析 {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 "不能讀取 \"{0}\""
 
-#: ../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."
@@ -11031,34 +11129,34 @@
 "據您讀取到的相片時刻並選擇時區<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 "相片時刻 (取自 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 時刻（自上列相片讀取）： "
 
-#: ../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 "我所在的時區： "
 
-#: ../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 "沒有日期"
 
-#: ../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 "開啟其他相片"
 
-#: ../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 "從 GPS 接收器的相片同步時間"
 
-#: ../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"
@@ -11068,69 +11166,69 @@
 "請使用要求的格式"
 
-#: ../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 "無效的日期"
 
-#: ../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 "<尚未載入 GPX 軌跡>"
 
-#: ../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 軌跡： "
 
-#: ../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 "開啟另一個 GPX 軌跡"
 
-#: ../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 "時區： "
 
-#: ../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 "位移："
 
-#: ../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>我的 GPS 接收器可以拍照。<br>這樣有幫助嗎？</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 "更新位置： "
 
-#: ../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 "所有圖片"
 
-#: ../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 "圖片沒有 exif 位置"
 
-#: ../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 "尚未加上標籤的圖片"
 
-#: ../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 "將圖片與 GPX 軌跡關聯"
 
-#: ../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 "關聯"
 
-#: ../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 "自動猜測"
 
-#: ../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 "您應該選擇一個 GPX 軌跡"
 
-#: ../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 "沒有選取的 GPX 軌跡"
 
-#: ../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 ""
@@ -11141,9 +11239,9 @@
 "預期的格式：{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 "無效的時區"
 
-#: ../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 ""
@@ -11154,65 +11252,65 @@
 "預期的格式：{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 "無效的移位"
 
-#: ../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 "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項"
 
-#: ../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 軌跡已載入"
 
-#: ../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 "選取的相片未包含時刻資訊。"
 
-#: ../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 "相片未包含時刻資訊"
 
-#: ../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."
 msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
-#: ../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 軌跡沒有時刻資訊"
 
-#: ../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 "時區：{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 "分鐘：{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 "秒鐘：{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 "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。"
 
-#: ../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 "({0} 天的時間差異)"
 
-#: ../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 "在軌跡與相片間的補償：{0}分 {1}秒"
 
-#: ../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 "
@@ -11220,13 +11318,13 @@
 msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
 
-#: ../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 "比對相片至軌跡失敗"
 
-#: ../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 "調整時區並補償"
 
-#: ../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 "預設值"
@@ -11247,5 +11345,5 @@
 msgstr "檔案 {0} 有錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11258,37 +11356,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 "載入檔案有錯誤"
 
-#: ../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 "蘭勃特區 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 "蘭勃特區 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 "蘭勃特區 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 "蘭勃特區 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: 不合法的 url。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11300,18 +11398,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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "選擇自..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "自動來源"
@@ -11341,34 +11439,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 "以 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 "反轉灰色（用於黑色背景）。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "設定背景透明度。"
 
-#: ../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 "繪出已下載資料的邊界。"
 
-#: ../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 "啟用自動快取。"
 
-#: ../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 "最大快取容量 (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."
@@ -11380,18 +11478,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "法國 cadastre 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 "<html>當自動來源啓用時設定鍵「source」的數值</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "來源"
 
-#: ../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 "
@@ -11399,5 +11497,5 @@
 msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。"
 
-#: ../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). "
@@ -11405,74 +11503,74 @@
 msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "允許多重圖層堆疊"
 
-#: ../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 "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。"
 
-#: ../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 "在從 WMS 伺服器下載的資料周圍繪出一個矩形。"
 
 #. 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 "抓取較小的圖片（較高的品質但消耗更多記憶體）"
 
-#: ../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 "固定大小矩形（預設為 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 "固定大小（從 25 到 100 公尺）"
 
-#: ../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 "當超過這個大小時較舊的檔案會自動刪除"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "自動標籤來源已加入："
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "將「source=...」加入元件？"
 
-#: ../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}"
 
-#: ../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 "正在連接 WMS 伺服器..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "建立建築"
 
-#: ../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"
@@ -11482,30 +11580,30 @@
 "建築匯入的大小限制在最大 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 ""
 
-#: ../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..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "解出最合適的邊界..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "建立邊界"
 
-#: ../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"
@@ -11513,29 +11611,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 ""
 
-#: ../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 "只在向量式圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "解開建築足跡"
 
-#: ../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 "從法國 Cadastre WMS 下載圖片"
 
-#: ../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"
@@ -11544,13 +11642,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"
@@ -11558,5 +11656,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"
@@ -11564,14 +11662,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"
@@ -11579,14 +11677,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"
@@ -11594,64 +11692,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 "區域"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "蘭勃特區"
 
-#: ../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 "從快取載入位置（只有在快取已啟用時）"
 
-#: ../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 "改變位置"
 
-#: ../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 "為下個要求設定新的位置"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "加入新的圖層"
 
-#: ../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 "位置"
 
-#: ../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 "
@@ -11661,25 +11759,25 @@
 "點。</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr "加入新的圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "重設 cookie"
 
-#: ../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 "取得新的 cookie（作業階段逾時）"
 
-#: ../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
@@ -11688,14 +11786,14 @@
 msgstr[0] "簡化路徑（移除 {0} 個節點）"
 
-#: ../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"
 
-#: ../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"
@@ -11703,5 +11801,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
@@ -11709,5 +11807,5 @@
 msgstr "從 {0} 下載 WMS 拼貼"
 
-#: ../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"
@@ -11717,34 +11815,34 @@
 "請先選擇它們中的一個，然後重試"
 
-#: ../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 "空白圖層"
 
-#: ../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 圖層 ({0})，已載入 {1} 個拼貼"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "並非向量化的。"
 
-#: ../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 "是向量化的。"
 
-#: ../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 ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11755,18 +11853,18 @@
 "建立一個新的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "快取格式錯誤"
 
-#: ../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 "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "快取蘭勃特區發生錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -11875,9 +11973,9 @@
 msgstr "建立重複的路徑"
 
-#: ../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 "編輯 GPX 軌跡的圖層"
 
-#: ../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 "轉換為沒有時刻的 GPX 圖層"
@@ -11894,11 +11992,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 "從 GPX 圖層匯入路徑"
 
 #: ../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 ""
@@ -11908,5 +12006,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 "找不到 GPX 資料圖層。"
@@ -12118,5 +12216,5 @@
 msgstr "顯示無 geotag 的相片"
 
-#: ../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 "匯入的圖片"
@@ -12542,5 +12640,5 @@
 msgstr "兩個已取選節點間的角度"
 
-#: ../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 "要進行測量的圖層"
@@ -12619,5 +12717,5 @@
 msgstr "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 議題"
@@ -12756,7 +12854,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "層級"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -12922,43 +13019,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 "快速地圖"
 
-#: ../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 "自動縮放： "
-
-#: ../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 "載入拼貼"
 
-#: ../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 "載入拼貼狀態"
-
-#: ../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 "載入所有拼貼"
 
-#: ../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 "增加縮放"
 
-#: ../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 "減少縮放"
 
-#: ../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 "圖片 "
@@ -12994,7 +13089,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "最大縮放等級： "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13340,6 +13434,6 @@
 msgstr "您確定嗎？"
 
-#: ../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
@@ -13347,5 +13441,5 @@
 msgstr "驗證的錯誤"
 
-#: ../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 "沒有驗證上的錯誤"
@@ -13434,5 +13528,5 @@
 msgstr "驗證其他的"
 
-#: ../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}"
@@ -13532,7 +13626,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "未排序的海岸線"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13562,18 +13655,18 @@
 msgstr "路徑交叉"
 
-#: ../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 "重複的節點"
 
-#: ../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 "這會測試有沒有位置非常相近的節點存在。"
 
-#: ../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 ""
@@ -13727,80 +13820,80 @@
 #. 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 "繪圖問題"
 
-#: ../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 "設定鍵「{0}」無效。"
 
-#: ../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 "標籤沒有數值"
 
-#: ../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 "無效的屬性設定鍵"
 
-#: ../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 "屬性設定鍵中有無效的空白字元"
 
-#: ../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 "屬性數值以空白字元開頭或結尾"
 
-#: ../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 "屬性數值含有 HTML 標記"
 
-#: ../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 "設定鍵「{0}」不在預設組合裡。"
 
-#: ../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 "預設組合不包含屬性設定鍵"
 
-#: ../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 "設定鍵「{1}」的數值「{0}」不在預設組合中。"
 
-#: ../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 "預設組合不包含屬性數值"
 
-#: ../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 "FIXMES"
 
-#: ../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 "檢查屬性設定鍵。"
 
-#: ../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 "檢查文字清單以驗證屬性設定鍵是有效的。"
 
-#: ../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 "使用複雜的屬性檢查器。"
 
-#: ../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 "使用複雜的規則驗證屬性數值。"
 
-#: ../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 "標籤檢查器來源"
 
-#: ../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."
@@ -13810,86 +13903,86 @@
 "openstreetmap.org/index.php/User:JLS/speller）"
 
-#: ../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 "將新的來源加入清單。"
 
-#: ../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 "編輯選取的來源。"
 
-#: ../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 "從清單刪除選取的來源。"
 
-#: ../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 "資料來源"
 
-#: ../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 "檢查屬性數值。"
 
-#: ../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 "驗證屬性數值合於預設組合的要求。"
 
-#: ../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 "檢查 FIXMES。"
 
-#: ../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 "尋找在任何屬性數值中含有 FIXME 的節點或路徑。"
 
-#: ../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 "檢查繪圖筆記。"
 
-#: ../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 "檢查地圖繪製是否發現資料錯誤。"
 
-#: ../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 "使用預設的資料檔案。"
 
-#: ../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 "使用預設的資料檔案（建議值）。"
 
-#: ../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 "使用預設的拼字檢查檔案。"
 
-#: ../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 "使用預設的拼字檢查檔案（建議值）。"
 
-#: ../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 "修正屬性"
 
-#: ../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 "找不到元件類型"
 
-#: ../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 "找不到警告等級"
 
-#: ../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 "不合法的辭句「{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}''"
@@ -14064,17 +14157,17 @@
 msgstr "這個測試會檢查路徑的結束點是否非常靠近其他的路徑。"
 
-#: ../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 "路徑結束點靠近其他的公路"
 
-#: ../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 "路徑結束點靠近其他的路徑"
 
-#: ../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 "路徑節點靠近其他的路徑"
 
-#: ../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 "已連接的路徑結束點靠近其他的路徑"
@@ -14125,13 +14218,13 @@
 msgstr "這個測試會檢查水域、陸地和海岸線路徑的方向。"
 
-#: ../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 "反轉的海岸線：陸地不在左側"
 
-#: ../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 "反轉的水域：陸地不在左側"
 
-#: ../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 "反轉的陸地：陸地不在左側"
@@ -14167,7 +14260,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 圖層 ({0})，於縮放 {1} 下載"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14175,82 +14268,65 @@
 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"
-msgstr "到達交會點"
+#: ../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 "下載"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "從 OSM 主機下載圖資"
+
+#: ../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
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, 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 "正在移除重複的節點..."
+
+#: ../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 ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
 msgstr "發生例外"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "求助"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "求助 / 關於"
-
-#: ../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 ""
-"您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會在 "
-"WMS 選單中顯示出來。\n"
-"\n"
-"您也可以在進階偏好設定中手動完成它，使用下列配置：\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"
-"完整 WMS URL 輸入格式範例 (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只需要"
-"輸入相對的「id」。\n"
-"要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換成您"
-"的圖片 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"
-"注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "WMS 外掛程式求助"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14354,28 +14430,28 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "自動下載"
 
-#: ../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 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../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 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14386,55 +14462,55 @@
 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"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../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 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../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 "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
@@ -18876,14 +18952,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "考古學地區"
+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 "編輯考古學地區"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -26852,64 +26926,78 @@
 msgstr ""
 
+#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
+
+#~ msgid "No earliest version found. History is empty."
+#~ msgstr "找不到最早的版本。歷史紀錄是空的。"
+
+#~ msgid "No latest version found. History is empty."
+#~ msgstr "找不到最新的版本。歷史紀錄是空的。"
+
+#~ msgid "Select a starting node on the end of a way"
+#~ msgstr "在路徑的結尾選擇開始的節點"
+
+#~ msgid "Reached the end of the line"
+#~ msgstr "到達線條的結尾"
+
+#~ msgid "Reached a junction"
+#~ msgstr "到達交會點"
+
+#~ msgid "help"
+#~ msgstr "求助"
+
+#~ msgid "Help / About"
+#~ msgstr "求助 / 關於"
+
+#~ 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 ""
+#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會"
+#~ "在 WMS 選單中顯示出來。\n"
+#~ "\n"
+#~ "您也可以在進階偏好設定中手動完成它，使用下列配置：\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"
+#~ "完整 WMS URL 輸入格式範例 (landsat)\n"
+#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+#~ "\n"
+#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只"
+#~ "需要輸入相對的「id」。\n"
+#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換"
+#~ "成您的圖片 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"
+#~ "注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "WMS 外掛程式求助"
+
 #~ msgid "File could not be found."
 #~ msgstr "找不到檔案"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "請選擇至少一項要下載的工作"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "上傳至 OSM API 失敗"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "衝突的關係"
-
-#~ msgid "Error while parsing"
-#~ msgstr "分析時發生錯誤"
-
-#~ msgid "File not found"
-#~ msgstr "找不到檔案"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "請先輸入想要的坐標。"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "先選擇一個書籤。"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "請輸入搜尋字串"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "不能從伺服器讀取位置搜尋結果"
-
-#~ msgid "name"
-#~ msgstr "名稱"
-
-#~ msgid "zoom"
-#~ msgstr "縮放"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "請選擇要複製的列。"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
-#~ "warntime」。)"
-
-#~ msgid "Request Update"
-#~ msgstr "要求更新"
-
-#~ msgid "error loading metadata"
-#~ msgstr "載入中繼資料時發生錯誤"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "要求更新發生錯誤：不縮放-等級 12"
-
-#~ msgid "requested: {0}"
-#~ msgstr "要求的：{0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "要求更新時發生錯誤"
 
 #~ msgid "Combine Anyway"
@@ -26945,4 +27033,7 @@
 #~ msgstr "所有的路徑都是空的"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "請選擇至少一項要下載的工作"
+
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
@@ -27005,4 +27096,7 @@
 #~ msgstr "偵測到衝突"
 
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "上傳至 OSM API 失敗"
+
 #~ msgid "No data imported."
 #~ msgstr "沒有匯入資料。"
@@ -27014,4 +27108,7 @@
 #~ msgstr "刪除 {1} {0}"
 
+#~ msgid "Conflicting relation"
+#~ msgstr "衝突的關係"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -27029,4 +27126,7 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "File not found"
+#~ msgstr "找不到檔案"
+
 #~ msgid "Merging conflicts."
 #~ msgstr "正在合併衝突。"
@@ -27053,4 +27153,13 @@
 #~ msgstr "匯入時有衝突項目。"
 
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "不能從伺服器讀取位置搜尋結果"
+
+#~ msgid "name"
+#~ msgstr "名稱"
+
+#~ msgid "zoom"
+#~ msgstr "縮放"
+
 #~ msgid "Public"
 #~ msgstr "公開"
@@ -27088,4 +27197,13 @@
 #~ msgid "Error when communicating with server."
 #~ msgstr "與伺服器連線時發生錯誤。"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "請先輸入想要的坐標。"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "先選擇一個書籤。"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "請輸入搜尋字串"
 
 #~ msgid ""
@@ -27117,4 +27235,7 @@
 #~ "看到此訊息後請勿上傳任何資料。"
 
+#~ msgid "Error while parsing"
+#~ msgstr "分析時發生錯誤"
+
 #~ msgid "Tagging preset source"
 #~ msgstr "標籤預設組合來源"
@@ -27162,4 +27283,11 @@
 #~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
 
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
+#~ "warntime」。)"
+
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "在非-路徑中發現 <nd> 元件。"
@@ -27213,4 +27341,13 @@
 #~ msgstr "初始化 API 失敗。請稍後再試一次。"
 
+#~ msgid "error loading metadata"
+#~ msgstr "載入中繼資料時發生錯誤"
+
+#~ msgid "requested: {0}"
+#~ msgstr "要求的：{0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "要求更新時發生錯誤"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "匯入 TCX 檔案..."
@@ -27233,4 +27370,7 @@
 #~ msgid "Open User Page"
 #~ msgstr "開啟使用者頁面"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "請選擇要複製的列。"
 
 #~ msgid "% of lon:"
@@ -27253,4 +27393,7 @@
 #~ msgstr "歷史記錄項目"
 
+#~ msgid "Request Update"
+#~ msgstr "要求更新"
+
 #~ msgid "Station"
 #~ msgstr "車站"
@@ -27282,4 +27425,7 @@
 #~ msgid "No data"
 #~ msgstr "沒有資料"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "要求更新發生錯誤：不縮放-等級 12"
 
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
