Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:15+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,8 +17,8 @@
 "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-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -26,5 +26,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -33,14 +33,14 @@
 msgstr "المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -77,6 +77,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -91,4 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -104,6 +109,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -111,82 +116,11 @@
 msgstr "خطأ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "التغييرات غير المحفوظة"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "حفظ و خروج"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "تجاهل و خروج"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "إلغاء"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "تجاهل URL سيئة التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -208,7 +142,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -222,5 +156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -247,13 +181,13 @@
 msgstr "التحذير"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "تجاهل عنوان  الملف  المشوه : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "إلغاء"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,39 +536,4 @@
 msgid "Please select at least three nodes."
 msgstr "الرجاء إختيار على الأقل ثلاثة عقد."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -654,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -762,5 +710,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -776,5 +724,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -824,8 +772,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -996,5 +946,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr ""
 
@@ -1002,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1032,5 +982,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "حرّر"
@@ -1708,14 +1658,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "حمّل إلى أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1724,23 +1674,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "لا يوجد تغييرات للتحميل."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1754,17 +1704,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1775,39 +1725,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1919,8 +1870,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "لم يتم تحميل أي معطيات"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2436,4 +2383,63 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
 msgid "Error while communicating with server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
 msgstr ""
 
@@ -2538,6 +2544,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2562,5 +2568,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2616,5 +2622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2622,6 +2628,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2630,5 +2636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2902,5 +2908,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2919,18 +2925,21 @@
 msgstr "درجات دقائق ثواني"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "ج."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "غ."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "ش."
@@ -2944,41 +2953,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -2996,29 +3027,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3028,33 +3060,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3067,12 +3100,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3080,5 +3107,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3228,5 +3255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3241,5 +3268,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3254,5 +3281,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3735,5 +3762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
@@ -3796,5 +3823,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3894,5 +3921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3900,15 +3927,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3964,5 +3991,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3970,5 +3997,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3976,13 +4003,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3990,5 +4018,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4005,5 +4033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4014,5 +4042,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4027,5 +4055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4037,5 +4065,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4045,5 +4073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4051,5 +4079,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4057,5 +4086,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4086,6 +4115,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4093,5 +4122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4101,5 +4130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4107,5 +4136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4300,5 +4329,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4359,5 +4388,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4365,5 +4394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4473,14 +4502,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4489,7 +4518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4558,5 +4585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4579,4 +4606,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4732,5 +4764,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4788,5 +4820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4824,5 +4856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4892,5 +4924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<مختلف>"
@@ -5116,6 +5148,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5167,5 +5198,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5391,4 +5421,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5422,5 +5456,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5687,5 +5726,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5693,28 +5732,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6827,4 +6865,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "تجاهل و خروج"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6838,4 +6880,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "حفظ و خروج"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7056,6 +7102,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7175,36 +7224,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "نقطة gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7212,5 +7261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7219,5 +7268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7252,4 +7301,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7308,5 +7358,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr ""
@@ -7321,5 +7371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7327,5 +7377,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7427,5 +7477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7433,32 +7483,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "مسلك واحد"
-msgstr[1] "مسلكين"
-msgstr[2] "ثلاثة مسالك"
-msgstr[3] "مسالك"
-msgstr[4] "مسالك"
-msgstr[5] "مسالك"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7470,5 +7500,5 @@
 msgstr[5] "نقاط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7477,5 +7507,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7484,5 +7514,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7618,5 +7648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr ""
@@ -7632,5 +7662,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7798,4 +7828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8339,5 +8370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -8524,33 +8555,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "مزيد من المعلومات عن هذه الميزة"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "طريق مغلقة الدوران"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8561,15 +8593,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8583,18 +8615,18 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "غيّر الخصائص"
@@ -8624,10 +8656,4 @@
 msgstr "جاري تحميل النقاط {0} إلى {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8641,11 +8667,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "لم أتمكن من قراءة \"{0}\""
 
@@ -8662,5 +8687,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "وصف أثر جهاز تحديد المواقع العالمي"
 
@@ -8724,5 +8749,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8735,5 +8759,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
@@ -8745,5 +8769,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8795,5 +8819,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8833,5 +8857,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8849,5 +8873,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8855,5 +8879,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8861,5 +8885,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8873,10 +8897,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -8893,5 +8911,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8923,20 +8941,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8949,5 +8962,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8964,6 +8977,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8974,15 +8993,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8990,11 +9009,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9013,5 +9026,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9089,5 +9102,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9095,5 +9108,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9109,15 +9122,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9125,10 +9131,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9136,5 +9143,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9142,5 +9149,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9148,6 +9155,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9160,32 +9167,37 @@
 msgstr "خطأ تحليل نحوي"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9197,5 +9209,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9216,5 +9228,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
@@ -9223,26 +9235,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9250,10 +9251,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9265,5 +9266,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9271,5 +9272,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9277,6 +9278,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9284,5 +9285,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9291,5 +9292,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9308,10 +9309,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9344,5 +9340,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9357,5 +9353,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9366,9 +9362,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9378,5 +9374,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9386,5 +9382,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9425,5 +9421,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9801,5 +9797,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9868,5 +9864,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9875,5 +9871,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9882,5 +9878,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9889,5 +9885,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9896,5 +9892,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10034,4 +10030,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "إستيفاء العنوان"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10146,4 +10271,9 @@
 msgid "Error while parsing {0}"
 msgstr "خطء عند تحليل {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "لم أتمكن من قراءة \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10426,13 +10556,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10441,13 +10571,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10800,28 +10930,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10830,14 +10960,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12208,13 +12338,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12239,41 +12360,4 @@
 msgstr ""
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "المستخدِم"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "أعرض لوحة المؤلف"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "إفتح صفحة المستخدم"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "إفتح صفحة المستخدم في متصفح الإنترنت"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "إختر معطيات المستخدم"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "يبدل الخيار بمعطيات المستخدمين"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "الرجاء إنتقاء مستخدم بواسطة لوحة المؤلف"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "عفواً، لا يعمل للمستخدمين مجهولي الهوية"
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
@@ -12443,10 +12527,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12524,11 +12608,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
 msgstr ""
 
@@ -12599,21 +12701,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12621,35 +12723,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12657,5 +12759,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12673,18 +12775,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12692,29 +12794,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12730,33 +12832,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12765,7 +12867,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12773,80 +12875,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12854,130 +12956,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "نوع الرياضة {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13073,5 +13175,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13087,91 +13189,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13557,6 +13659,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13565,10 +13672,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13580,10 +13687,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13591,10 +13698,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13603,10 +13710,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13615,20 +13722,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13638,10 +13745,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13649,5 +13756,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13657,10 +13764,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13670,15 +13777,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13686,5 +13793,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13692,5 +13799,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13699,15 +13806,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13716,10 +13823,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13728,15 +13835,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13746,13 +13853,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18725,4 +18825,24 @@
 msgstr "مدرج ألعاب رياضية"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19477,10 +19597,4 @@
 msgid "Country code"
 msgstr "رمز البلد"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "إستيفاء العنوان"
 
 #. item
@@ -25685,4 +25799,7 @@
 #~ msgstr "البريد الإلكتروني"
 
+#~ msgid "No data imported."
+#~ msgstr "لم يتم تحميل أي معطيات"
+
 #~ msgid "Data Layer"
 #~ msgstr "طبقة المعطيات"
@@ -25792,4 +25909,55 @@
 #~ msgid "sports"
 #~ msgstr "مبيع لوازم للأنشطة رياضية"
+
+#~ msgid "Open User Page"
+#~ msgstr "إفتح صفحة المستخدم"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "إفتح صفحة المستخدم في متصفح الإنترنت"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "أعرض لوحة المؤلف"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "حرّر مكتب إستعلامات"
+
+#~ msgid "Map Type"
+#~ msgstr "نوع الخريطة"
+
+#~ msgid "Board Type"
+#~ msgstr "نوع اللوحة"
+
+#~ msgid "board"
+#~ msgstr "اللوح"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
+
+#~ msgid "User"
+#~ msgstr "المستخدِم"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "الرجاء إنتقاء مستخدم بواسطة لوحة المؤلف"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "عفواً، لا يعمل للمستخدمين مجهولي الهوية"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "يبدل الخيار بمعطيات المستخدمين"
+
+#~ msgid "Select User's Data"
+#~ msgstr "إختر معطيات المستخدم"
+
+#~ msgid "Charge"
+#~ msgstr "رسم الدخول / الإستعمال"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "التغييرات غير المحفوظة"
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -25802,26 +25970,2 @@
 #~ "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A "
 #~ "HREF=\"{1}\">بِلغتك</A>."
-
-#~ msgid "Edit Information Office"
-#~ msgstr "حرّر مكتب إستعلامات"
-
-#~ msgid "Map Type"
-#~ msgstr "نوع الخريطة"
-
-#~ msgid "Board Type"
-#~ msgstr "نوع اللوحة"
-
-#~ msgid "board"
-#~ msgstr "اللوح"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
-
-#~ msgid "Charge"
-#~ msgstr "رسم الدخول / الإستعمال"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:16+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:19+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,5 +32,5 @@
 msgstr "Помощ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -38,9 +38,9 @@
 "Проекцията {0} не може да бъде активирана. Използва се меркаторска проекция."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -77,6 +77,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -91,4 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -104,6 +109,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -111,84 +116,11 @@
 msgstr "Грешка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Има незапазени промени в {0} слой. Отхвърляне на промените и продължаване?"
-msgstr[1] ""
-"Има незапазени промени в {0} слоя. Отхвърляне на промените и продължаване?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Незаписани промени"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Запис и Изход"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Откажи промените и Изход"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Отмяна"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнориране на неправилна препратка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -210,7 +142,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -224,5 +156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -249,13 +181,13 @@
 msgstr "Внимание"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнориране неправилен адрес на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -404,4 +336,52 @@
 msgid "Merge"
 msgstr "Обединение"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Отмяна"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -497,4 +477,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -509,5 +490,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -544,6 +525,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -566,45 +547,4 @@
 msgstr "Изберете не по-малко от три точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Текущият брой на промените надхвърля максималния. Текущ брой - {0}, "
-"максимален - {1}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Превишаване възможностите на API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития "
-"примитив {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Дължината на стойността за етикет ''{0}'' на примитива {1} превишава "
-"максимално позволената дължина {2}. Дължината на стойностите е {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Нарушение на предсъстоянието."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -657,10 +597,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Затваряне на отворени пакети с промени"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Затваря отворени пакети с промени"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -672,5 +612,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -680,15 +620,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:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Няма отворени пакети с промени"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Зареждане на отворени пакети с изменения"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -786,5 +726,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -800,5 +740,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -849,8 +789,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1022,5 +964,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "Параметърът {0} не трябва да е празен"
 
@@ -1028,5 +970,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
 
@@ -1058,5 +1000,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Редактиране"
@@ -1767,14 +1709,14 @@
 msgstr "Няма нищо избрано."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Качи на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Качване на всички промени на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1785,23 +1727,23 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Няма промени за качване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Синхронизирани само {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Синхронизиране на целия набор данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1823,17 +1765,17 @@
 "редактирането.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Забелязан е конфликт."
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "неочаквана върната стойност {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1849,16 +1791,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "Пакета с изменения е затворен"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1867,5 +1810,5 @@
 "\"!"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1874,18 +1817,18 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Качването към OSM API пропадна."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Обновяване на примитива."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1998,8 +1941,4 @@
 msgstr ""
 "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Никакви данни не са импортирани"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2270,5 +2209,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Моля въведете филтър."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2290,5 +2229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "търсене в селекцията"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2410,5 +2349,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Submit filter"
-msgstr ""
+msgstr "Приемане на филтър"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2546,4 +2485,69 @@
 msgid "Error while communicating with server."
 msgstr "Грешка по време на връзката със сървъра."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Текущият брой на промените надхвърля максималния. Текущ брой - {0}, "
+"максимален - {1}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Превишаване възможностите на API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития "
+"примитив {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Дължината на стойността за етикет ''{0}'' на примитива {1} превишава "
+"максимално позволената дължина {2}. Дължината на стойностите е {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Нарушение на предсъстоянието."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Циклична зависимост между релации:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Релация ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... се отнася за релация"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Циклични зависимости"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2648,9 +2652,7 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Внимание: слоя ''{0}'' вече не съществува. Не може да се разреши конфликт за "
-"примитив ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr "вече регистриран конфликт за примитив ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2676,5 +2678,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 "невъзможно е разрешаването на конфликт, за който няма предложено решение."
@@ -2735,5 +2737,5 @@
 "от релацията?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Разделяне пътен сегмент"
@@ -2741,6 +2743,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2752,5 +2754,5 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Потвърждение за изтриване"
@@ -2850,15 +2852,15 @@
 #, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr ""
+msgstr "Разрешаване конфликт на версиите за пътища {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
 #, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr ""
+msgstr "Разрешаване на конфликт на версиите за релация {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Разрешаване конфликтите в списъка от връзки на път {0}"
+msgstr "Разрешаване на конфликт във възлите на път {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2936,5 +2938,5 @@
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
@@ -3034,5 +3036,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "вече регистриран конфликт за примитив ''{0}''"
 
@@ -3051,18 +3053,21 @@
 msgstr "Градуси, минути, секунди"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "Ю"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "И"
@@ -3076,43 +3081,65 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr "П"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "С"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "Текст"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "Д"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "И"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgstr "Р"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgstr "З"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgstr "Д"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgstr "И"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
+msgstr "С"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3128,29 +3155,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
 
@@ -3160,33 +3188,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr "Няма примитив с версия {0} в тази история"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr "Няма валидна версия от дата ''{0}'' в тази история"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "няма намерена по-ранна версия. Историята е празна."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "няма намерена последна версия. Историята е празна."
 
@@ -3199,12 +3228,6 @@
 msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''"
 
@@ -3212,5 +3235,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
 
@@ -3360,5 +3383,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3369,5 +3392,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3378,5 +3401,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3867,5 +3890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "слоя не е в списъка."
 
@@ -3929,5 +3952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "роля {0} не участва в двойката за сравнение {1}"
 
@@ -4027,5 +4050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -4033,15 +4056,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "списъкът в роля {0} понастоящем не участва в двойка за сравнение"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "точка {0} не е открита в списъка"
 
@@ -4099,5 +4122,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4105,5 +4128,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4111,13 +4134,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4125,5 +4149,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4140,5 +4164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Преместване нагоре на избраните елементи с една позиция"
 
@@ -4149,5 +4173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Преместване на избраните елементи надолу с една позиция"
 
@@ -4162,5 +4186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4172,5 +4196,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Фиксиране  на текущия списък обединени елементи"
 
@@ -4180,5 +4204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 "Освобождаване на списъка обединени елементи и стартиране на обединяването"
@@ -4187,5 +4211,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4193,5 +4218,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4222,6 +4247,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4229,5 +4254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4237,5 +4262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4243,5 +4268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4442,5 +4467,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4501,5 +4526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4507,5 +4532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
 
@@ -4615,14 +4640,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4631,7 +4656,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4696,5 +4719,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4717,4 +4740,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4870,5 +4898,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4926,5 +4954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "индекс извън границите. Имаме: {0}"
 
@@ -4962,5 +4990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Показване историята на избрания примитив"
 
@@ -5030,5 +5058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<различни>"
@@ -5256,6 +5284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5309,5 +5336,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5533,4 +5559,8 @@
 msgstr "Потвърди празна роля"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5564,5 +5594,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5833,5 +5868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5839,19 +5874,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5859,9 +5898,4 @@
 msgid "Load history"
 msgstr "Зареди историята"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6973,4 +7007,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Откажи промените и Изход"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6984,4 +7022,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Запис и Изход"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7204,6 +7246,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7319,36 +7364,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS точка"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7356,5 +7401,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7363,5 +7408,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7396,4 +7441,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7452,5 +7498,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
@@ -7465,5 +7511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7471,5 +7517,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7577,5 +7623,5 @@
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7583,28 +7629,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "следа"
-msgstr[1] "следи"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7612,5 +7642,5 @@
 msgstr[1] "точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7619,5 +7649,5 @@
 msgstr[1] "следа с {0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7626,5 +7656,5 @@
 msgstr[1] "{0} се състои от {1} следи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7762,5 +7792,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Моля, изберете ред за редактиране"
@@ -7776,5 +7806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7958,4 +7988,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8515,5 +8546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Изтриване на източник от списъка"
@@ -8728,33 +8759,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Повече информация за тази възможност"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Незадължителни Атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Използване шаблон ''{0}'' от група ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Използване шаблон ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "затворен път"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8765,15 +8797,15 @@
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8783,18 +8815,18 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Промяна параметри"
@@ -8824,10 +8856,4 @@
 msgstr "Зареждане точки {0} до {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8841,11 +8867,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Не може да се прочете \"{0}\""
 
@@ -8864,5 +8889,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Описание на GPS следата"
 
@@ -8926,5 +8951,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8937,5 +8961,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
 
@@ -8947,5 +8971,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8997,5 +9021,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -9035,5 +9059,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -9053,5 +9077,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}"
 
@@ -9059,5 +9083,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -9065,5 +9089,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9077,10 +9101,4 @@
 msgstr "Успешно отворен списък с промени {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9097,5 +9115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Няма съществуващ набор промени за качване на разлики"
 
@@ -9127,20 +9145,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9153,5 +9166,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Сървърът отговори с код на грешка: {0}"
 
@@ -9168,6 +9181,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9178,15 +9197,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9194,11 +9213,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9217,5 +9230,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9295,5 +9308,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9301,5 +9314,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9315,15 +9328,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9331,10 +9337,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9342,5 +9349,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9348,5 +9355,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9354,6 +9361,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9366,32 +9373,37 @@
 msgstr "Грешка при разбор."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9403,5 +9415,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9422,5 +9434,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Недопустим обект с id=0"
 
@@ -9429,26 +9441,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9456,10 +9457,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9471,5 +9472,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9477,5 +9478,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9483,6 +9484,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9490,5 +9491,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9497,5 +9498,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9514,10 +9515,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9550,5 +9546,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9563,5 +9559,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9572,10 +9568,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9585,5 +9581,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9593,5 +9589,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9632,5 +9628,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10042,5 +10038,5 @@
 "за грешка е:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10114,5 +10110,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10121,5 +10117,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10128,5 +10124,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10135,5 +10131,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10142,5 +10138,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10282,4 +10278,133 @@
 msgstr "Качване на следи на openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Интерполация на адреси"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Нечетни"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Четни"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10398,4 +10523,9 @@
 msgid "Error while parsing {0}"
 msgstr "Грешка при разбор {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Не може да се прочете \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10689,13 +10819,13 @@
 msgstr "Избери от..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10704,13 +10834,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11083,28 +11213,28 @@
 msgstr "Празен слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Не е векоторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер на растера: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Векторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11115,14 +11245,14 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Грешка в кеширането на Ламбертовата зона"
@@ -12535,13 +12665,4 @@
 msgstr "Разделяне на сграда"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Четни"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Нечетни"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12565,41 +12686,4 @@
 msgid "Optional"
 msgstr "Незадължително"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Потребител"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Показване на панела автори"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Отовори потребителската страница"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Отовори потребителската страница в браузър"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Избери потребителски данни"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Замени селекцията с потребителски данни"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Моля изберете някакви данни"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Моля, изберете потребител използвайки панела на авторите"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Извинете, за анонимни потребители това е недостъпно"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12779,10 +12863,10 @@
 msgstr "Няма грешки при проверката"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Мрежа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12864,12 +12948,30 @@
 msgstr "друго при проверка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Проверка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Изпълнение на проверка на данните"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12939,21 +13041,21 @@
 msgstr "Замяна на \"{0}\" с \"{1}\" за"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Брегови линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Този тест проверява за правилността на бреговите линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Неподредени брегови линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Пресичащи се пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12963,35 +13065,35 @@
 "пресичат в един слой без да имат общ възел."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Пресичащи се сгради"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Възли в една и съща позиция"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Потвърждение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Дублирани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12999,5 +13101,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Изриване на дублиращите се пътища"
@@ -13015,18 +13117,18 @@
 msgstr "Повтарящи се точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Точки с еднакви имена"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Този тест проверява за точки с еднаки имена (може да са повторения)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Припокриващи се пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13036,29 +13138,29 @@
 "повече от един път."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Припокриващи се области"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Застъпващи се пътища от пътната мрежа (с области)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Застъпващи се ЖП линии (с области)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Застъпващи се пътища / линии (с области)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Припокриващи се пътища / магистрали"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Припокриващи се ЖП линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Припокриващи се пътища / линии"
@@ -13076,10 +13178,10 @@
 "от веднъж."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Подобно наименувани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13088,9 +13190,9 @@
 "правописни грешки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Проверка на параметрите:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -13098,15 +13200,15 @@
 "стойности"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Невалидна линия на таг-проверка - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Невалидна линия на правописна проверка: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13117,7 +13219,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Неправилна комбинация маркер/стойност"
@@ -13125,80 +13227,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Проблем с изобразяването"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправилен ключ ''{0}''."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Маркери с празни стойности"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Неправилен параметров ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Неправилен интервал в ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "Стойност на параметър започва или завършва с интервал"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Стойности съдържащи HTML елементи"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключ ''{0}'' не е намерен в шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Шаблоните не съдържат такъв ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Шаблоните не съдържат стойност"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "ЗА ПОПРАВКА"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Проверка на ключовете."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверяване за валидни ключове и сравняване със списък от думи."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Използване на сложен параметров тест."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверяване стойностите и маркерите използвайки по-сложни правила."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Източници за TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13209,131 +13311,131 @@
 "маркирането."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "Добавяне нов източник в списъка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Източници на данни"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Проверка стойностите."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr "Проверяване дали стойностите са правилни спрямо шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Проверка за маркерни \"ЗА ПОПРАВКА\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Проверка за бележки при рисуване."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr "Проверява дали картата при русиване е открила грешки в данните."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Използване на файл с данни по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Използване на файла с данни по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Използване на файла за проверка на правопис по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Поправи параметрите"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Не може да бъде открит типа на елемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Не може да бъде открито нивото на предупрежение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Неправилен израз ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Неправилен регулярен израз ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Незатворени пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Това проверява дали пътища, които са кръгови са затворени."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "естествен тип {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "земеползване от тип {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "удобства от тип {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "спорт типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "туризъм типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "тип на магазина: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "отдих тип {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13429,5 +13531,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13443,93 +13545,93 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "област"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Незатворен път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Несвързани пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Този тест проверява дали път има крайна точка близо до друг път."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "Края на път близо до друг път/магистрала"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "Края на път близо до друг път/линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Възел близо до друг път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Свързан край на път е близо до друг път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Немаркирани или несвързани точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 "Този тест проверява за немаркирани точки, които не са част от някой път."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Немаркирани, празни или пътища от една точка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Неименовани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Ненаименовано съединение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Немаркирани пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Празни пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Пътища от една точка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Неправилно подредени пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Този тест проверява за посоката на вода, земя или брегови линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "Обърната брегова линия: земята не е отляво"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "Обърната посока на границата на водоем: земята не е от ляво"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Обърната посока на линията на сушата: земята не е от ляво"
@@ -13927,6 +14029,11 @@
 msgstr "Трябва да направите редакциите си публични за да качвате нови данни"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13937,10 +14044,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "Специален handler за френския поземлен регистър WMS сървър."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13957,10 +14064,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Създаване мрежа от пътища"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13968,10 +14075,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13982,10 +14089,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Дублира път с отместване."
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13994,20 +14101,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Предоставя фонов слой, показващ мрежа на картата."
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14020,10 +14127,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Помага за векторизиране на WMS изображения."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14032,5 +14139,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14043,10 +14150,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14059,15 +14166,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Показва OpenLayers фоново изображение"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Вкарва проблеми от OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14077,5 +14184,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14085,5 +14192,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14094,15 +14201,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14111,10 +14218,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14125,15 +14232,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14147,17 +14254,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Инструменти за работа с автори/потребители. Избиране картови данни, които "
-"принадлежат на определен потребител, отваря браузър с профила на избран "
-"автор."
 
 #. Plugin utilsplugin
@@ -19134,4 +19231,24 @@
 msgstr "стадион"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19886,10 +20003,4 @@
 msgid "Country code"
 msgstr "Код на държава"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Интерполация на адреси"
 
 #. item
@@ -26055,7 +26166,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "параметърът '{0}' не трябва да е празен"
-
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -26111,4 +26219,7 @@
 #~ msgid "Aborting..."
 #~ msgstr "Прекъсване..."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Незаписани промени"
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
@@ -26304,4 +26415,31 @@
 #~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS"
 
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Моля, изберете потребител използвайки панела на авторите"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Извинете, за анонимни потребители това е недостъпно"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Замени селекцията с потребителски данни"
+
+#~ msgid "Please select some data"
+#~ msgstr "Моля изберете някакви данни"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Отовори потребителската страница в браузър"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Избери потребителски данни"
+
+#~ msgid "Open User Page"
+#~ msgstr "Отовори потребителската страница"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Показване на панела автори"
+
+#~ msgid "User"
+#~ msgstr "Потребител"
+
 #~ msgid "Occupied By"
 #~ msgstr "Обект"
@@ -26432,4 +26570,7 @@
 #~ msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация."
 
+#~ msgid "No data imported."
+#~ msgstr "Никакви данни не са импортирани"
+
 #~ msgid "Data Layer"
 #~ msgstr "Слой с данни"
@@ -26551,18 +26692,4 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Редактирай падаща решетка"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- изпълняващата се версия е {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
-#~ "<A HREF=\"{1}\">на вашия език</A>."
 
 #~ msgid ""
@@ -26574,4 +26701,12 @@
 #~ "от GPX следи. Това разширение може да се използва да подготви следа за "
 #~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата."
+
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Инструменти за работа с автори/потребители. Избиране картови данни, които "
+#~ "принадлежат на определен потребител, отваря браузър с профила на избран "
+#~ "автор."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26651,13 +26786,9 @@
 #~ msgstr "Възникна грешка при записа. Грешката е: {0}"
 
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
-#~ "<br>{0}</html>"
-
 #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
 #~ msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}"
+
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "параметърът '{0}' не трябва да е празен"
 
 #~ msgid "Delete all"
@@ -26692,4 +26823,13 @@
 #~ msgstr "Използване на нов списък с промени и затваряне"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Има незапазени промени в {0} слой. Отхвърляне на промените и продължаване?"
+#~ msgstr[1] ""
+#~ "Има незапазени промени в {0} слоя. Отхвърляне на промените и продължаване?"
+
 #~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
@@ -26703,2 +26843,13 @@
 #~ msgid "No currently open changeset. Opening a new changeset..."
 #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
+#~ "<A HREF=\"{1}\">на вашия език</A>."
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:06+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:13+0000\n"
 "Last-Translator: Martin Petricek <singularita@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,8 +16,8 @@
 "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-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projekce {0} nemohla být aktivována. Používam Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,83 +115,11 @@
 msgstr "Chyba"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?"
-msgstr[1] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
-msgstr[2] "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Neuložené změny"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Uložit a ukončit"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Neuložit změny a ukončit"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -208,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -222,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -247,13 +180,13 @@
 msgstr "Varování"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -396,4 +329,52 @@
 msgid "Merge"
 msgstr "Sloučit"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Zrušit"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -489,4 +470,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -501,5 +483,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -536,6 +518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -558,45 +540,4 @@
 msgstr "Vyberte minimálně 3 uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum je "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Narušení schopností API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Délka hodnoty tagu \"{0}\" na primitivu {1} překračuje povolenou délku {2}. "
-"Délka hodnoty je {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Selhal předpoklad"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -649,10 +590,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Uzavřít otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Uzavře otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -664,5 +605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -672,15 +613,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Nejsou otevřené žádné sady změn"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Žádné otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Stahování otevřených sad změn..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -775,5 +716,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -789,5 +730,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -837,8 +778,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1009,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parametr ''{0}'' nesmí být null"
 
@@ -1015,5 +958,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti je: "
@@ -1047,5 +990,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Upravit"
@@ -1742,14 +1685,14 @@
 msgstr "Prázdný výběr"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Nahrát všechy změny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1758,23 +1701,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovat pouze {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1795,17 +1738,17 @@
 "pro přerušení a pokračování editace.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Detekován konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1821,39 +1764,40 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "Sada změn byla uzavřena"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Aktualizuji prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1966,8 +1910,4 @@
 msgstr ""
 "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Nic nebylo importováno"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2241,5 +2181,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Prosím zadejte řetězec filtru"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2261,5 +2201,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "Najít ve výběru"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2294,4 +2234,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - klíč 'type' s libovolnou hodnotou. Vyzkoušejte také "
+"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
@@ -2380,5 +2322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Submit filter"
-msgstr ""
+msgstr "Přidat filtr"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2404,5 +2346,5 @@
 #, java-format
 msgid "Nothing find in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Nebyly nalezeny pro záznamy ''{0}'' při hledání ve výběru"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
@@ -2511,4 +2453,69 @@
 msgid "Error while communicating with server."
 msgstr "Chyba při komunikaci se serverem."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum je "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Narušení schopností API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Délka hodnoty tagu \"{0}\" na primitivu {1} překračuje povolenou délku {2}. "
+"Délka hodnoty je {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Selhal předpoklad"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Kruhová závislost mezi relacemi:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Relace..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... odkazuje na relaci"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Kruhové závislosti"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2610,11 +2617,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
-#, fuzzy, java-format
-msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Varování: vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
-"''{1}''"
+#, java-format
+msgid ""
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2638,5 +2643,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
@@ -2699,5 +2704,5 @@
 "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
@@ -2705,6 +2710,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2716,5 +2721,5 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -2824,7 +2829,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Vyřešení konfliktů v seznamu uzlů cesty {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2994,5 +2999,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -3011,18 +3016,21 @@
 msgstr "Stupně minuty sekundy"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "V"
@@ -3036,41 +3044,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "požadován parametr {0} > 0. Zadáno {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3088,29 +3118,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "očekáváno id >= 0. Nalezeno {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+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:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, 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:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "očekávána verze > 0. Nalezena {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3120,33 +3151,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, 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:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "nenalezena novější verze. Historie je prázdná."
 
@@ -3159,12 +3191,6 @@
 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/RelationMember.java:34
-#, 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/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
 
@@ -3172,5 +3198,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
@@ -3323,5 +3349,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3333,5 +3359,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3343,5 +3369,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3833,5 +3859,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "vrstva není v seznamu"
 
@@ -3894,5 +3920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3992,5 +4018,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
 
@@ -3998,15 +4024,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "položka {0} nenalezena v seznamu"
 
@@ -4062,5 +4088,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů"
 
@@ -4068,5 +4094,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
 
@@ -4074,5 +4100,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopírovat mé vybrané elementy za vybraný element ze seznamu slučovaných "
@@ -4080,10 +4106,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů"
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
 
@@ -4091,5 +4118,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Kopírovat cizí vybrané elementy před vybraný element ze seznamu slučovaných "
@@ -4110,5 +4137,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Posunout vybrané elementy o jednu pozici nahoru"
 
@@ -4119,5 +4146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Posunout vybrané elementy o jednu pozici dolu"
 
@@ -4132,5 +4159,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
 
@@ -4142,5 +4169,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Blokovat aktuání seznam slučovaných elementů"
 
@@ -4150,5 +4177,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Odblokovat aktuání seznam slučovaných elementů"
 
@@ -4156,5 +4183,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
@@ -4164,5 +4192,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4198,6 +4226,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4205,5 +4233,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4213,5 +4241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4219,5 +4247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "neočekávaný index sloupce. Zadáno {0}"
 
@@ -4420,5 +4448,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
 
@@ -4479,5 +4507,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "nelze aplikovat nerozhodnutou položku slučování tagů"
 
@@ -4485,5 +4513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
 
@@ -4593,14 +4621,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "parametr ''{0}'' nesmí být prázdný"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "soubor tagů neobsahuje zvolenou hodnotu ''{0}''"
 
@@ -4609,7 +4637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr "Zatím nerozhodnuto"
 
@@ -4677,5 +4703,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4699,4 +4725,9 @@
 msgid "Undecided"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
+msgstr "Zatím nerozhodnuto"
 
 #. --- role editing
@@ -4840,5 +4871,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Filtruje objekty a schová/zneaktivní je."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -4853,5 +4884,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4860,25 +4891,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Přidat filtr."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Upravit filtr."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Smazat filtr."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Přesunout filtr nahoru."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Přesunout filtr dolu."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Aktivovat filtr."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
@@ -4892,9 +4923,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Inverse filter"
-msgstr ""
+msgstr "Negovat filtr"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Mód filtrování"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -4909,5 +4940,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4945,5 +4976,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Zobrazit historii vybraného prvku"
 
@@ -5014,5 +5045,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<různé>"
@@ -5244,6 +5275,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
 
@@ -5296,5 +5326,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5535,4 +5564,8 @@
 msgstr "Potvrdit prázdnou roli"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Upravit relaci na kterou odkazuje vybraný člen"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5566,6 +5599,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "očekáváno child.getId() >0. Nalezeno {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5831,5 +5869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5837,19 +5875,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5857,9 +5899,4 @@
 msgid "Load history"
 msgstr "Nahrát hostorii"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr "očekáváno id > 0, nalezeno {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6971,4 +7008,8 @@
 msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Neuložit změny a ukončit"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6982,4 +7023,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "Smazat vrstvy bez ukládání. Neuložené změny budou ztraceny."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Uložit a ukončit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7209,6 +7254,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7325,36 +7373,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps bod"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7362,5 +7410,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7369,5 +7417,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7402,4 +7450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7460,5 +7509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
@@ -7473,5 +7522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7479,5 +7528,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7583,5 +7632,5 @@
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7589,29 +7638,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "tras"
-msgstr[1] "trasa"
-msgstr[2] "trasy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7620,5 +7652,5 @@
 msgstr[2] "body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7628,5 +7660,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7636,5 +7668,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7766,5 +7798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Zvolte řádek k editaci"
@@ -7780,5 +7812,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7946,4 +7978,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8493,5 +8526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Smazat vybraný zdroj ze seznamu."
@@ -8681,33 +8714,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Použít přednastavení \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8718,15 +8752,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8737,18 +8771,18 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
@@ -8778,10 +8812,4 @@
 msgstr "Stahuji body {0} až {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8795,11 +8823,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr "Nemohu exportovat \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Nemůžu číst \"{0}\""
 
@@ -8818,5 +8845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "popis gps trasy"
 
@@ -8880,5 +8907,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8891,5 +8917,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
 
@@ -8901,5 +8927,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku"
@@ -8952,5 +8978,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem "
@@ -8992,5 +9018,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -9010,5 +9036,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}"
 
@@ -9016,5 +9042,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
 
@@ -9022,5 +9048,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
@@ -9035,10 +9061,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9055,5 +9075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Není k dizpozici sada změn pro rozdílový upload"
 
@@ -9085,20 +9105,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9111,5 +9126,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Server odpověděl chybou s kódem {0}"
 
@@ -9126,7 +9141,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "povinný atribut ''{0}'' chybí"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9136,15 +9157,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9152,12 +9173,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "Chybějící povinný atribut ''{0}'' XML elementu {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Chybějící povinný atribut ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
@@ -9175,5 +9190,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
 
@@ -9255,5 +9270,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr "<html>Při ukládání došlo k chybě.<br>Chyba: <br>{0}</html>"
 
@@ -9261,5 +9276,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9276,15 +9291,8 @@
 msgstr "OSM soubory komprimované pomocí gzip"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "povinný atribut ''{0}'' chybí"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''"
@@ -9293,5 +9301,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno ''{1}''"
@@ -9299,5 +9308,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
 
@@ -9305,5 +9314,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''"
@@ -9312,5 +9321,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''"
@@ -9319,6 +9328,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, zadáno "
@@ -9333,27 +9342,32 @@
 msgstr "Chyba během parsování"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Soubor \"{0}\" neexistuje"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+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:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+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:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+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:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 "Nalezen XML element <member> jinde, než jako přímý potomek elementu "
@@ -9362,5 +9376,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Chybějící atribut ''ref'' na členu v relaci {0}"
 
@@ -9372,5 +9386,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}"
 
@@ -9392,5 +9406,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
@@ -9399,26 +9413,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9426,10 +9429,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+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:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}"
 
@@ -9441,5 +9444,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9447,5 +9450,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9453,6 +9456,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9460,5 +9463,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9467,5 +9470,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9484,10 +9487,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9520,5 +9518,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
 
@@ -9533,5 +9531,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Nepodařilo se navázat spojení s API {0}"
 
@@ -9542,5 +9540,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k "
@@ -9548,5 +9546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9556,5 +9554,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9564,5 +9562,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9603,5 +9601,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10015,5 +10013,5 @@
 "již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10085,5 +10083,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10092,5 +10090,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10099,5 +10097,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10106,5 +10104,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10113,5 +10111,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10251,4 +10249,133 @@
 msgstr "Nahraje trasy na openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolace adres"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Liché"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Sudé"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10367,4 +10494,9 @@
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nemůžu číst \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10658,13 +10790,13 @@
 msgstr "Vyberte z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10673,13 +10805,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11049,28 +11181,28 @@
 msgstr "Prázdná vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Velikost rastru: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11081,9 +11213,9 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11091,5 +11223,5 @@
 "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
@@ -12496,13 +12628,4 @@
 msgstr "Řada domů"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Sudé"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Liché"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12526,41 +12649,4 @@
 msgid "Optional"
 msgstr "Volitelné"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Uživatel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Zobrazit panel autorů"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Otevřít stránku uživatele"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Otevřít stránku uživatele v prohlížeči"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Vybrat data uživatele"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Nahradí výběr uživatelskými daty"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Vyberte nějaká data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Vyberte uživatele v panelu autorů"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Sorry, nefunguje s anonymními uživateli."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12737,10 +12823,10 @@
 msgstr "Žádné chyby při kontrole"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Mřížka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12820,12 +12906,30 @@
 msgstr "ostatní kontroly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Kontrola"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Provede kontrolu dat"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12895,21 +12999,21 @@
 msgstr "Zaměňte \"{0}\" za \"{1}\" pro"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Linie pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnost linií pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Neuspořádané pobřeží"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Křížící se cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12917,35 +13021,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Křížící se budovy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Zkřížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Uzly na stejné pozici"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Potvrzení"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Duplicitní cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12955,5 +13059,5 @@
 "souřadnicemi uzlů."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Smazat duplicitní cesty"
@@ -12971,19 +13075,19 @@
 msgstr "Duplicitní uzly v cestě"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Uzly se stejným jménem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 "Tento test kontroluje, jestli nemají uzly stejné jméno (mohou být duplikáty)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Překrývající se cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12993,29 +13097,29 @@
 "jak jednou cestou."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Překrývající se plochy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Překrývající se silnice (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Překrývající se železnice (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Překrývající se cesta (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Překrývající se silnice"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Překrývající se železnice"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Překrývající se cesty"
@@ -13032,33 +13136,33 @@
 "Tento test kontroluje cesty, jestli neobsahují některý uzel více než jednou."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Cesty s podobnými jmény"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13069,7 +13173,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinace klíče/hodnoty"
@@ -13077,80 +13181,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problém s vykreslováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klíč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Klíče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Neplatné klíče vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Předvolby neobsahují vlastnost klíč"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Předvolby neobsahují vlastnost hodnota"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "OPRAVY"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Kontrola klíčů vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Použít komplexní kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "zdroj TagCheckeru"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13158,91 +13262,91 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Zdroje dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Kontrola hodnot vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Zkontrolovat tagy s FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Použít stadardní datový soubor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Opravit vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Nelze najít typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Nelze najít úroveň varování"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Neplatný regulární výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Neuzavřené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
@@ -13250,40 +13354,40 @@
 "skutečně uzavřené."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "sport typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turistické typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "obchod typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13379,5 +13483,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13393,91 +13497,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "oblast"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Neuzavřená cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Nespojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Uzel cesty poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový uzel cest poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Neotagované a nespojené uzly."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Neotagované, prázdné a jednouzlové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Tento test hledá neotagované, prázdné a jednouzlové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Nepojmenované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Nepojmenovaná křižovatka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Neotagované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Prázdné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Cesty s jediným uzlem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Špatně uspořádané cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 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:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Obrácená země: země není na levé straně"
@@ -13892,6 +13996,11 @@
 msgstr "Musíte vaše editace označit jako veřejné pro nahrávání nových dat"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13900,10 +14009,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13919,10 +14028,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Plugin Vytvořit pravidelné sítě cest"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13930,10 +14039,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13944,10 +14053,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Plugin Duplikovat_cestu"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13958,20 +14067,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Vizualizuje informace o směrování v podobě grafu."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13981,5 +14090,5 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
@@ -13988,5 +14097,5 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13995,5 +14104,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14006,10 +14115,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14022,15 +14131,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14039,5 +14148,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14046,5 +14155,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14055,15 +14164,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14074,10 +14183,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14088,15 +14197,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14106,16 +14215,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří "
-"určitmu uživateli, otevře prohlížeč se stránkou vybraného autora."
 
 #. Plugin utilsplugin
@@ -19092,4 +19192,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19844,10 +19964,4 @@
 msgid "Country code"
 msgstr "Kód země"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolace adres"
 
 #. item
@@ -26013,10 +26127,10 @@
 msgstr "Český UHUL:ORTOFOTO"
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parametr '{0}' nesmí být null (prázdný)"
-
 #~ msgid "Email"
 #~ msgstr "E-mail"
 
+#~ msgid "No data imported."
+#~ msgstr "Nic nebylo importováno"
+
 #~ msgid "Data Layer"
 #~ msgstr "Vrstva dat"
@@ -26072,4 +26186,7 @@
 #~ 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."
@@ -26230,4 +26347,19 @@
 #~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
 
+#~ msgid "User"
+#~ msgstr "Uživatel"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Otevřít stránku uživatele v prohlížeči"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Vybrat data uživatele"
+
+#~ msgid "Open User Page"
+#~ msgstr "Otevřít stránku uživatele"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Sorry, nefunguje s anonymními uživateli."
+
 #~ msgid "Commit comment"
 #~ msgstr "Poslat komentář"
@@ -26300,4 +26432,13 @@
 #~ msgid "Public"
 #~ msgstr "Veřejné"
+
+#~ msgid "Please select some data"
+#~ msgstr "Vyberte nějaká data"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Zobrazit panel autorů"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Vyberte uživatele v panelu autorů"
 
 #~ msgid "sports"
@@ -26399,15 +26540,4 @@
 #~ msgstr "cyklistická mapa"
 
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
-#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
-
 #~ msgid ""
 #~ "No data to update found. Have you already opened or downloaded a data "
@@ -26420,7 +26550,4 @@
 #~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- běžící verze je {0}"
-
 #~ msgid "Edit Information Office"
 #~ msgstr "Editovat turistické informační centrum"
@@ -26441,4 +26568,11 @@
 #~ msgid "board"
 #~ msgstr "obecná nástěnka"
+
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří "
+#~ "určitmu uživateli, otevře prohlížeč se stránkou vybraného autora."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26525,4 +26659,7 @@
 #~ msgstr "sady změn"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parametr '{0}' nesmí být null (prázdný)"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Aplikovat částečná řešení"
@@ -26533,11 +26670,4 @@
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "V OSM datech chybí číslo verze"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</"
-#~ "html>"
 
 #~ msgid "An error occurred while saving. Error is: {0}"
@@ -26560,4 +26690,7 @@
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Mazání vrstvy {0} z {1}"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Nahradí výběr uživatelskými daty"
 
 #~ msgid "Use the existing changeset {0} and close it after upload"
@@ -26574,4 +26707,14 @@
 #~ "vkládání dalších dat"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?"
+#~ msgstr[1] ""
+#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
+#~ msgstr[2] ""
+#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
+
 #~ msgid "Close current changeset"
 #~ msgstr "Uzavřít aktuální sadu změn"
@@ -26585,2 +26728,16 @@
 #~ msgid "not yet decided"
 #~ msgstr "zatím nerozhodnoto"
+
+#~ msgid "Missing mandatory attribute ''{0}''"
+#~ msgstr "Chybějící povinný atribut ''{0}''"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
+#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/da.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:08+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:09+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Hjælp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projiceringen {0} kunne ikke aktiveres. Benytter Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Fejl"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
-msgstr[1] "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Ugemte ændringer"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Gem og afslut"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Smid væk og afslut"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Fortryd"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorerer defekt URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerer defekt fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -393,4 +327,52 @@
 msgid "Merge"
 msgstr "Sammenflet"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Fortryd"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -486,4 +468,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -498,5 +481,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -533,6 +516,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -554,42 +537,4 @@
 msgid "Please select at least three nodes."
 msgstr "Vælg venligst mindst tre punkter."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Det nuværende antal ændringer overskrider det maksimale antal; nuværende er "
-"{0}, maksimum er {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Brud på API-egenskaber"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Brud på forudgående krav"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} punkter i vej {1} overskrider det maksimalt tilladte antal punkter {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -658,5 +603,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -774,5 +719,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -788,5 +733,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -836,8 +781,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1008,5 +955,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameteren \"{0}\" må ikke være en null-værdi"
 
@@ -1014,5 +961,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1044,5 +991,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Rediger"
@@ -1732,14 +1679,14 @@
 msgstr "Intet er valgt"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Send til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Send alle ændringer til OSM-serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1748,23 +1695,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Intet at sende. Skab først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Ingen ændringer at sende."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisér kun {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synkronisér hele datasættet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1778,17 +1725,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Der er opdaget en konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "uventet svar. Modtog {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1799,39 +1746,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Upload til OSM-API'et fejlede"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Opdaterer primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1943,8 +1891,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Intet data importeret."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2474,4 +2418,66 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Det nuværende antal ændringer overskrider det maksimale antal; nuværende er "
+"{0}, maksimum er {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Brud på API-egenskaber"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Brud på forudgående krav"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} punkter i vej {1} overskrider det maksimalt tilladte antal punkter {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2573,6 +2579,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2597,5 +2603,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2651,5 +2657,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Opdel vejstykke"
@@ -2657,6 +2663,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2668,5 +2674,5 @@
 "måske bruger dem.<br>Vil du virkelig slette?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2772,7 +2778,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Løs konflikter i punktlisten for vejen {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2942,5 +2948,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2959,18 +2965,21 @@
 msgstr "Grader minutter sekunder"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "Ø"
@@ -2984,41 +2993,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Parameteren ''{0}'' > 0 forventet, modtog ''{1}''"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3036,29 +3067,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\""
 
@@ -3068,33 +3100,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3107,12 +3140,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3120,5 +3147,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3268,5 +3295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3277,5 +3304,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3286,5 +3313,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3766,5 +3793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "lag er ikke i listen"
 
@@ -3828,5 +3855,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3926,5 +3953,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3932,15 +3959,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3996,5 +4023,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4002,5 +4029,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4008,13 +4035,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4022,5 +4050,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4037,5 +4065,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Flyt de valgte elementer ét trin op"
 
@@ -4046,5 +4074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Flyt de valgte elementer ét trin ned"
 
@@ -4059,5 +4087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4069,5 +4097,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4077,5 +4105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4083,5 +4111,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4089,5 +4118,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4118,6 +4147,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4125,5 +4154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4133,5 +4162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4139,5 +4168,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "uventet kolonne-indeks. Modtog {0}"
 
@@ -4334,5 +4363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4393,5 +4422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4399,5 +4428,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parameteren 'col' skal være 0 eller 1. Modtog {0}"
 
@@ -4507,14 +4536,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4523,7 +4552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4588,5 +4615,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4609,4 +4636,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4764,5 +4796,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4820,5 +4852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4856,5 +4888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4924,5 +4956,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<forskellige>"
@@ -5148,6 +5180,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5199,5 +5230,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5423,4 +5453,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5454,5 +5488,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5723,5 +5762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5729,28 +5768,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6863,4 +6901,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Smid væk og afslut"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6874,4 +6916,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Gem og afslut"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7092,6 +7138,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7207,36 +7256,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7244,5 +7293,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7251,5 +7300,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7284,4 +7333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7340,5 +7390,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
@@ -7353,5 +7403,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7359,5 +7409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7462,5 +7512,5 @@
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7468,28 +7518,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "spor"
-msgstr[1] "spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7497,5 +7531,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7504,5 +7538,5 @@
 msgstr[1] "et spor med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7511,5 +7545,5 @@
 msgstr[1] "{0} består af {1} spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7641,5 +7675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Vælg venligst rækken, der skal rettes."
@@ -7655,5 +7689,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7821,4 +7855,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8371,5 +8406,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Slet den valgte kilde fra listen."
@@ -8564,33 +8599,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Mere information om denne feature"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Valgfri attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Brug forudindstilling \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8601,15 +8637,15 @@
 msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementer af typen {0} er understøttet."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8619,18 +8655,18 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Udvælgelse uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Anvend Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Ret egenskaber"
@@ -8660,10 +8696,4 @@
 msgstr "Henter punkter {0} til {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8677,11 +8707,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Kunne ikke læse \"{0}\""
 
@@ -8700,5 +8729,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "beskrivelse af gps-spor"
 
@@ -8762,5 +8791,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8773,5 +8801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
 
@@ -8783,5 +8811,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8833,5 +8861,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8871,5 +8899,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8887,5 +8915,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8893,5 +8921,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8899,5 +8927,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8909,10 +8937,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8931,5 +8953,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8961,20 +8983,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8987,5 +9004,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9002,6 +9019,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9012,15 +9035,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9028,11 +9051,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9051,5 +9068,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9129,5 +9146,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9135,5 +9152,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9149,15 +9166,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9165,10 +9175,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9176,5 +9187,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9182,5 +9193,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9188,6 +9199,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9200,32 +9211,37 @@
 msgstr "Fejl ved fortolkning"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9237,5 +9253,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9256,5 +9272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Ugyldigt objekt med id=0"
 
@@ -9263,26 +9279,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9290,10 +9295,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9305,5 +9310,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9311,5 +9316,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9317,6 +9322,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9324,5 +9329,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9331,5 +9336,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9348,10 +9353,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9384,5 +9384,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9397,5 +9397,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9406,10 +9406,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9419,5 +9419,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9427,5 +9427,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9466,5 +9466,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9866,5 +9866,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9937,5 +9937,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9944,5 +9944,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9951,5 +9951,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9958,5 +9958,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9965,5 +9965,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10103,4 +10103,133 @@
 msgstr "Sender sporinger til openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Adresse-interpolering"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Ulige"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Lige"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10219,4 +10348,9 @@
 msgid "Error while parsing {0}"
 msgstr "Fejl ved indlæsning {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kunne ikke læse \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10509,13 +10643,13 @@
 msgstr "Vælg fra..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10524,13 +10658,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10886,28 +11020,28 @@
 msgstr "Tomt lag"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10916,14 +11050,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12299,13 +12433,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Lige"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Ulige"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12329,41 +12454,4 @@
 msgid "Optional"
 msgstr "Valgfri"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Bruger"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Vis forfatterpanel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Åbn brugerside"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Åbn brugerside i browser"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Vælg brugerens data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Vælg venligst noget data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Vælg venligst en bruger fra forfatter-panelet"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Beklager, virker ikke med anonyme brugere"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12534,10 +12622,10 @@
 msgstr "Ingen valideringsfejl"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Gitter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12618,12 +12706,30 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Foretager datavalidering"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12693,21 +12799,21 @@
 msgstr "Erstat \"{0}\" med \"{1}\" for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Kystlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Denne test tjekker om kystlinjerne er korrekte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Krydsende veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12715,18 +12821,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Krydsende veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dublet-punkter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 ""
@@ -12734,18 +12840,18 @@
 "sted."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12753,5 +12859,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12769,18 +12875,18 @@
 msgstr "Dublet-vejpunkter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Punkter med samme navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Denne test finder punkter, som har samme navn (kan være dubletter)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Overlappende veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12790,29 +12896,29 @@
 "end én vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Overlappende områder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Overlappende landeveje (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Overlappende jernbaner (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Overlappende veje (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Overlappende landeveje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Overlappende jernbaner"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Overlappende veje"
@@ -12830,10 +12936,10 @@
 "én gang."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Veje med lignende navne"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -12841,23 +12947,23 @@
 "Denne test tjekker for veje med lignende navne, som kan være stavet forkert."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Egenskabstjekker:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ugyldig tagtjekker-linje - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavefejlskontrol-linje: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12868,7 +12974,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ugyldig kombination af tag/værdi"
@@ -12876,80 +12982,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Farvelægger problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nøgle \"{0}\" er ugyldig"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Tags med tomme værdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ulovlig egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Ulovligt blanktegn i egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Egenskabsværdi indeholder HTML-kodet tegn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 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:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 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:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Tjek egenskabsnøgler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Brug kompleks egenskabs-tjekker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "TagChecker-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12957,130 +13063,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Tjek egenskabsværdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Tjek for FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Brug standard-datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Brug standard-datafilen (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Brug standard-fil for stavekontrol."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Ret egenskaber"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Kunne ikke finde element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Kunne ikke finde advarsels-niveau"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ugyldigt udtryk ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ugyldigt regulært udtryk \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Uafsluttede veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Denne tester om veje, som burde være cirkulære, er aflukkede."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "natur-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "facilitets-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "sport-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turisme-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "butikstype {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "rekreations-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13176,5 +13282,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13190,92 +13296,92 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "område"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Uafsluttet vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Uforbundne veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Vejpunkt tæt på anden vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Forbundet vejs slutpunkt tæt på anden vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Utaggede og uforbundne punkter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "Denne test tjekker for utaggede punkter, som ikke er del af nogen vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Utaggede, tomme og enkeltpunkts-veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Denne test tjekker for utaggede, tomme og enkeltpunkts-veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Unavngivne veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Utaggede veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Tomme veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Enkeltpunkts-veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Denne test tjekker retningen for vand-, land- og kystlinje-veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Modsatrettet land: Der er ikke land på venstre side"
@@ -13665,6 +13771,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13675,10 +13786,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13690,10 +13801,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Opret et gitter af veje"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13701,10 +13812,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13715,10 +13826,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13729,20 +13840,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Hent GPS-punkter direkte ind i JOSM fra Globalsat dg100-datalogger."
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Tilføj et baggrundslag, der viser et kort-gitter"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13752,10 +13863,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Hjælper med at vektorisere billeder fra WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13765,5 +13876,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13773,10 +13884,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13786,15 +13897,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer sager fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13803,5 +13914,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13810,5 +13921,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13817,15 +13928,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13834,10 +13945,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13846,15 +13957,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Tilføjer en dialogboks for at rette tags i tabelform."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13864,14 +13975,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
 
 #. Plugin utilsplugin
@@ -18848,4 +18952,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19600,10 +19724,4 @@
 msgid "Country code"
 msgstr "Landekode"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Adresse-interpolering"
 
 #. item
@@ -25772,4 +25890,7 @@
 #~ 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 "
@@ -25930,4 +26051,7 @@
 #~ 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 "Click Reload to refresh list"
@@ -25980,4 +26104,28 @@
 #~ msgid "Portcullis"
 #~ msgstr "Faldgitter"
+
+#~ msgid "Open User Page"
+#~ msgstr "Åbn brugerside"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Åbn brugerside i browser"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Vis forfatterpanel"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Vælg brugerens data"
+
+#~ msgid "Please select some data"
+#~ msgstr "Vælg venligst noget data"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Beklager, virker ikke med anonyme brugere"
+
+#~ msgid "User"
+#~ msgstr "Bruger"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Vælg venligst en bruger fra forfatter-panelet"
 
 #~ msgid "Authors: {0}"
@@ -26147,14 +26295,4 @@
 #~ "billedet."
 
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
-#~ "href=\"{1}\">dit eget sprog</a>."
-
 #~ msgid ""
 #~ "No data to update found. Have you already opened or downloaded a data "
@@ -26163,7 +26301,4 @@
 #~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et "
 #~ "datalag?"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- nuværende version er {0}"
 
 #~ msgid ""
@@ -26276,4 +26411,13 @@
 #~ msgstr "Intet data"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
+#~ msgstr[1] ""
+#~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
+
 #~ msgid "Close current changeset"
 #~ msgstr "Luk nuværende rettesæt"
@@ -26281,2 +26425,12 @@
 #~ msgid "There is currently no changeset open."
 #~ msgstr "Der er ingen rettesæt åbne."
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
+#~ "href=\"{1}\">dit eget sprog</a>."
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/de.po	(revision 17764)
@@ -9,6 +9,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-20 08:00+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -17,8 +17,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -26,5 +26,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -33,5 +33,5 @@
 msgstr "Hilfe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -40,9 +40,9 @@
 "benutzt."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -79,6 +79,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -93,4 +93,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -106,6 +111,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -113,86 +118,11 @@
 msgstr "Fehler"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"{0} Ebene enthält ungespeicherte Änderungen. Diese Änderungen verwerfen und "
-"fortfahren?"
-msgstr[1] ""
-"{0} Ebenen enthalten ungespeicherte Änderungen. Diese Änderungen verwerfen "
-"und fortfahren?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Ungespeicherte Änderungen"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Speichern und Beenden"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Verwerfen und Beenden"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -214,7 +144,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -228,5 +158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -253,13 +183,13 @@
 msgstr "Warnung"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -371,5 +301,5 @@
 msgstr ""
 "WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den "
-"Informations- und Chronikseiten für OSM Primitive wird wahrscheinlich "
+"Informations- und Chronikseiten für OSM-Objekte wird wahrscheinlich "
 "fehlschlagen. API-Basis-URL lautet: \"{0}\""
 
@@ -411,4 +341,52 @@
 msgid "Merge"
 msgstr "Vereinen"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -504,4 +482,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -516,5 +495,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -551,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -572,47 +551,4 @@
 msgid "Please select at least three nodes."
 msgstr "Bitte mindestens drei Knotenpunkte auswählen."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl "
-"({1})."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Unvereinbarkeit den Fähigkeiten der API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird "
-"automatisch abgeschnitten"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Länge des Wertes ({3}) der Eigenschaft \"{0}\" von Element {1} überschreitet "
-"die maximal erlaubte Länge ({2})."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"Anzahl {0} der Knoten in Weg {1} überschreitet maximal erlaubte Knotenanzahl "
-"({2})"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -681,5 +617,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -797,5 +733,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -811,5 +747,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -859,8 +795,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1031,5 +969,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "Parameter \"{0}\" darf nicht NULL sein"
 
@@ -1037,5 +975,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
@@ -1068,5 +1006,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1107,9 +1045,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
 msgid "History of Element"
-msgstr "Geschichte des Elements"
+msgstr "Versionsprotokoll des Elements"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Versionsverlauf der Wege, Knoten oder Relationen anzeigen"
+msgstr "Versionsprotokoll der Wege, Knoten oder Relationen anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
@@ -1776,14 +1714,14 @@
 msgstr "Auswahl leer"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Zum OSM-Server hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1794,23 +1732,23 @@
 "gelöst werden müssen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Erfassen Sie erst einige Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Nur {0} {1} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Ganzen Datensatz synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1833,17 +1771,17 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Konflikt festgestellt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "Unerwarteter Rückgabewert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1859,21 +1797,26 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>Hochladen <strong>fehlgeschlagen</strong>, da der "
+"verwendete<br>Änderungssatz {0} bereits am {1} geschlossen wurde.<br>Bitte "
+"in einen neuen oder in einen vorhandenen, offenen Änderungssatz hochladen.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr "Änderungssatz geschlossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1881,18 +1824,18 @@
 "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Hochladen zu OSM-API fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Objekt aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2006,8 +1949,4 @@
 "Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
 "Fehlermeldung war: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Keine Daten importiert."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2286,5 +2225,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Bitte einen Filterbegriff eingeben:"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2306,5 +2245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "in der Auswahl suchen"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2432,5 +2371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Submit filter"
-msgstr ""
+msgstr "Filter bestätigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2457,4 +2396,5 @@
 msgid "Nothing find in selection by searching for ''{0}''"
 msgstr ""
+"Bei der Suche nach \"{0}\" konnte nichts in der Auswahl gefunden werden."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
@@ -2566,4 +2506,74 @@
 msgid "Error while communicating with server."
 msgstr "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl "
+"({1})."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Unvereinbarkeit den Fähigkeiten der API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird "
+"automatisch abgeschnitten"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Länge des Wertes ({3}) der Eigenschaft \"{0}\" von Element {1} überschreitet "
+"die maximal erlaubte Länge ({2})."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Unvereinbarkeit mit notwendigen Voraussetzungen"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"Anzahl {0} der Knoten in Weg {1} überschreitet maximal erlaubte Knotenanzahl "
+"({2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Gegenseitige Abhängigkeiten zwischen den Relationen:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} Relationen refernzieren sich gegenseitig.<br>Bevor die "
+"Gegenseitige Abhängigkeiten nicht gelöscht wurden, kann JOSM diese "
+"Relationen nicht hochladen.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Relation..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "...verweist auf Relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Gegenseitige Abhängigkeiten"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2668,9 +2678,9 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Warnung: Die Ebene \"{0}\" existiert nicht mehr. Kann Konflikt für Objekt "
-"\"{1}\" nicht entfernen"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+"Warnung: Ebene \"{0}\" existiert nicht mehr. Konflikt für Objekt \"{1}\" "
+"konnte nicht entfernt werden."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2696,5 +2706,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "Kann unentschiedenen Konflikt nicht auflösen"
 
@@ -2754,5 +2764,5 @@
 "Relation entfernen?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
@@ -2760,6 +2770,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2771,5 +2781,5 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Löschbestätigung"
@@ -2877,7 +2887,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
+msgstr "Konflikte in der Knotenliste des Weges {0} auflösen"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3068,5 +3078,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "Konflikt mit Element \"{0}\" besteht bereits"
 
@@ -3085,18 +3095,21 @@
 msgstr "Grad Minuten Sekunden"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "O"
@@ -3110,43 +3123,65 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr "A"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "S"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr "Text"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "K"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgstr "E"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgstr "H"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgstr "L"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
+msgstr "F"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3162,24 +3197,25 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+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:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 erwartet, jedoch {0} erhalten."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-"
@@ -3188,5 +3224,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse."
@@ -3197,6 +3233,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 "Merkmalsammlung konnte nicht auf ein Objekt angewendet werden,  da sie "
@@ -3205,29 +3241,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, 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:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 "Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "Keine \"älteste\" Version gefunden. Es gibt gar keine Geschichte."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "Keine \"neueste\" Version gefunden. Es gibt gar keine Geschichte."
 
@@ -3240,12 +3277,6 @@
 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/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
@@ -3255,5 +3286,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
@@ -3405,5 +3436,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3414,5 +3445,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3423,5 +3454,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3907,4 +3938,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
+"Mittlere Maustaste erneut klicken zum Durchwechseln.<br>STRG gedrückt "
+"halten, um mit der Maus aus der Liste zu wählen.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
@@ -3918,5 +3951,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "Ebene nicht in der Liste."
 
@@ -3981,5 +4014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
 
@@ -4083,5 +4116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
 
@@ -4089,15 +4122,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "Parameter \"index\" hat unerwarteten Wert {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "Element {0} nicht in der Liste gefunden"
 
@@ -4156,5 +4189,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente."
@@ -4163,5 +4196,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopiere meine gewählten Elemente vor das erste ausgewählte Element der Liste "
@@ -4171,5 +4204,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopiere meine gewählten Elemente hinter das erste ausgewählte Element der "
@@ -4177,5 +4210,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Kopiere meine gewählten Elemente an den Anfang der Liste vereinigter "
@@ -4183,5 +4217,5 @@
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente."
@@ -4190,5 +4224,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Kopiere deren gewählten Elemente vor das erste ausgewählte Element der Liste "
@@ -4209,5 +4243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Den ausgewählten Eintrag eine Position nach oben schieben."
 
@@ -4218,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Den ausgewählten Eintrag eine Position nach unten schieben."
 
@@ -4231,5 +4265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
@@ -4242,5 +4276,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Aktuelle Liste der vereinigten Elemente fixieren."
 
@@ -4250,5 +4284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben."
 
@@ -4256,5 +4290,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen zu beginnen.</html>"
 
@@ -4262,5 +4297,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4292,15 +4327,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"Anpassung {0} ist noch nicht registriert. Kann Teilnahme in synchronisierter "
-"Anpassung nicht setzen."
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "Anpassung {0} ist noch nicht registriert."
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4309,5 +4342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
@@ -4317,5 +4350,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "Unerwarteter Spaltenindex ({0})"
 
@@ -4524,5 +4557,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
@@ -4585,5 +4618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "Kann unentschiedenes Merkmalselement nicht anwenden"
 
@@ -4591,5 +4624,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
 
@@ -4696,13 +4729,14 @@
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
 msgstr ""
+"Alle zu \"{0}\" kombinierten Werte werden im Schlüssel \"{1}\" übernommen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "Parameter \"{0}\" darf nicht leer sein"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 "Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. "
@@ -4710,5 +4744,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "Merkmalssammlung enthält nicht den gewählten Wert \"{0}\""
 
@@ -4717,93 +4751,96 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "Noch ohne Lösung"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Merkmale von Knoten"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Merkmale von Wegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Merkmale von Relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Konflikte in eingefügten Tags"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} Weg"
+msgstr[1] "{0} Wege"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} Relation"
+msgstr[1] "{0} Relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "Einfügen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "Von..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "Nach..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} Merkmal"
+msgstr[1] "{0} Merkmale"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr "Lösche dieses Miglied aus der Relation."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr "Ersetzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+"Ersetze den Weg in den zugehörigen Relationen durch den neuen verbundenen "
+"Weg."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr "Ungelöst."
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
 msgstr "Noch ohne Lösung"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "Merkmale von Knoten"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "Merkmale von Wegen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "Merkmale von Relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "Konflikte in eingefügten Tags"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} Weg"
-msgstr[1] "{0} Wege"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} Relation"
-msgstr[1] "{0} Relationen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr "Einfügen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "Von..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "Nach..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-msgstr[0] "{0} Merkmal"
-msgstr[1] "{0} Merkmale"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
-#, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
-msgstr "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-msgid "Remove this relation member from the relation"
-msgstr "Lösche dieses Miglied aus der Relation."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-"Ersetze den Weg in den zugehörigen Relationen durch den neuen verbundenen "
-"Weg."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-msgid "Undecided"
-msgstr "Ungelöst."
 
 #. --- role editing
@@ -4953,5 +4990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Objekte filtern und verbergen/deaktivieren."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -4966,5 +5003,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4973,54 +5010,54 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Filter hinzufügen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Filter bearbeiten."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Filter löschen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Filter nach oben verschieben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Filter nach unten verschieben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Filter aktivieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Elemente verbergen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Apply also for children"
-msgstr ""
+msgstr "Auch auf Kinder anwenden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Inverse filter"
-msgstr ""
+msgstr "Filter invertieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Filtermodus"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
 msgid "History"
-msgstr "Verlauf"
+msgstr "Versionsprotokoll"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
 msgid "Display the history of all selected items."
-msgstr "Versionen aller gewählten Objekte anzeigen."
+msgstr "Versionsprotokoll aller gewählten Objekte anzeigen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "Tabellenindex außerhalb der Grenzen ({0})"
 
@@ -5046,5 +5083,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
 msgid "History item"
-msgstr "History-Eintrag"
+msgstr "Versionsprotokoll-Eintrag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
@@ -5058,5 +5095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "History der markierten Elemente anzeigen"
 
@@ -5128,5 +5165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<unterschiedlich>"
@@ -5362,6 +5399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
 
@@ -5415,5 +5451,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5667,4 +5702,8 @@
 msgstr "Leere Rolle bestätigen"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5701,6 +5740,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5953,15 +5998,15 @@
 #, java-format
 msgid "History for node {0}"
-msgstr "Chronik für Knoten {0}"
+msgstr "Versionsprotokoll für Knoten {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
 #, java-format
 msgid "History for way {0}"
-msgstr "Chronik für Weg {0}"
+msgstr "Versionsprotokoll für Weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
 #, java-format
 msgid "History for relation {0}"
-msgstr "Chronik für Relation {0}"
+msgstr "Versionsprotokoll für Relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -5971,8 +6016,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
 msgid "Reload the history from the server"
-msgstr "Geschichte erneut vom Server laden"
+msgstr "Versionsprotokoll erneut vom Server laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
@@ -5982,12 +6027,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr ""
-"Fehler beim Setzen der Referenz. Referenz-ID {0} stimmt nicht mit der ID "
-"'{1}' der Geschichte überein"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "Fehler beim Erstellen des Referenzelements. Version {0} der Referenz ist in "
@@ -5995,5 +6040,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 "Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
@@ -6002,30 +6047,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr "History laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr "id > 0 erwartet, aber {0} erhalten"
+msgstr "Versionsprotokoll laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #, java-format
 msgid "Loading history for node {0}"
-msgstr "Chronik für Knoten {0} laden"
+msgstr "Versionsprotokoll für Knoten {0} laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
 #, java-format
 msgid "Loading history for way {0}"
-msgstr "Chronik für Weg {0} laden"
+msgstr "Versionsprotokoll für Weg {0} laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr "Chronik für Relation {0} laden"
+msgstr "Versionsprotokoll für Relation {0} laden"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6951,5 +6993,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Erstellt am:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
@@ -6964,4 +7006,6 @@
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr ""
+"<html>Bitte wählen Sie die Änderungssätze, die geschlossen werden sollen</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
@@ -6976,9 +7020,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Ausgewählten offenen Änderungssatz schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Schließen von Änderungssätzen abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
@@ -6989,5 +7033,5 @@
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Änderungssatz {0} schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -7019,5 +7063,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Ebene \"{0}\" enthält keine Änderungen zum Hochladen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
@@ -7027,9 +7071,11 @@
 "''{1}''."
 msgstr ""
+"Ebene \"{0}\" enthält Änderungen, die in der verknüpften Datei \"{1}\" "
+"gespeichert werden sollten."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Ebene \"{0}\" enthält Änderungen, die gespeichert werden sollten."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
@@ -7144,4 +7190,8 @@
 msgstr "Diesen Dialog schließen und Bearbeitung in JOSM fortsetzen"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Verwerfen und Beenden"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7157,4 +7207,8 @@
 msgstr ""
 "Ebene ohne Speichern löschen. Ungespeicherte Änderungen gehen verloren."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Speichern und Beenden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7328,5 +7382,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 msgid "Upload all changes in one request"
-msgstr ""
+msgstr "Alle Änderungen in einer Anfrage hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
@@ -7344,25 +7398,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Neuen Änderungssatz öffnen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "Einen neuen Änderungssatz öffnen und beim nächsten Hochladen verwenden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Offenen Änderungssatz verwenden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Änderungssatz nach dem Hochladen schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
 msgstr ""
+"Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7376,13 +7431,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Liste Ihrer offenen Änderungssätze vom Server laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Ausgewählten offenen Änderungssatz schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7498,36 +7556,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS-Punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7535,5 +7593,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7542,5 +7600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7575,4 +7633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7589,6 +7648,6 @@
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Track"
+msgstr[1] "{0} Tracks"
 
 #. item "Relations/Route" text "Symbol description"
@@ -7601,9 +7660,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 msgid "Timespan"
-msgstr ""
+msgstr "Zeitraum"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Length"
-msgstr ""
+msgstr "Länge"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
@@ -7631,5 +7690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
@@ -7644,5 +7703,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7650,5 +7709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7759,5 +7818,5 @@
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7767,22 +7826,6 @@
 "<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
@@ -7790,5 +7833,5 @@
 msgstr[1] "GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7796,5 +7839,5 @@
 msgstr[1] "Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7803,5 +7846,5 @@
 msgstr[1] "Eine GPS-Spur mit {0} Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7810,5 +7853,5 @@
 msgstr[1] "{0} besteht aus {1} GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7947,5 +7990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
@@ -7961,5 +8004,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8144,4 +8187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8493,5 +8537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
-msgstr "integrierte Standardsymbole aktivieren"
+msgstr "Integrierte Standardsymbole aktivieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
@@ -8702,5 +8746,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle aus der Liste entfernen."
@@ -8910,33 +8954,34 @@
 msgstr "Auswahl in der Merkmalstabelle löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Mehr Informationen zu dieser Vorlage"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Verwende Vorlage \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "geschlossener Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8947,15 +8992,15 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente des Typs {0} werden unterstützt."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8965,18 +9010,18 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
@@ -8985,5 +9030,5 @@
 #, java-format
 msgid "Preset group ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "Vorlagengruppe \"{0}\" aus Gruppe ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
@@ -9006,10 +9051,4 @@
 msgstr "Punkte {0} bis {1} werden heruntergeladen..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -9023,11 +9062,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr "Kann \"{0}\" nicht exportieren"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Kann \"{0}\" nicht lesen"
 
@@ -9046,5 +9084,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Beschreibung der GPS-Spur"
 
@@ -9108,5 +9146,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -9119,5 +9156,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
 
@@ -9129,5 +9166,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Typ ist daher "
@@ -9181,5 +9218,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element"
 
@@ -9219,5 +9256,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren."
 
@@ -9237,5 +9274,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert."
 
@@ -9243,5 +9280,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\""
 
@@ -9249,5 +9286,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "Unerwartetes Format der neuen Version des geänderten Objekts {0}. Wert ist "
@@ -9263,10 +9300,4 @@
 msgstr "Änderungssatz {0} erfolgreich geöffnet"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9283,5 +9314,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Kein Änderungssatz zum Hochladen vorhanden"
 
@@ -9313,20 +9344,16 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
-msgstr ""
+msgid "Current changeset is null. Can't upload data."
+msgstr ""
+"Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9339,5 +9366,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Der Server hat einen Fehler mit Kode [{0} gemeldet"
 
@@ -9354,7 +9381,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "notwendiges Attribut \"{0}\" fehlt"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9364,15 +9397,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9380,12 +9413,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "Fehlendes obligatorisches Attribut \"{0}\" des XML-Elements {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Fehlendes obligatorisches Attribut \"{0}\""
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
@@ -9398,15 +9425,15 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "Undefiniertes Element \"{0}\" im Eingabestrom gefunden. Abbruch."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "Liste der Änderungssätze einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
@@ -9484,5 +9511,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 "<html>Beim Speichern ist ein Fehler aufgetreten.<br>Der Fehler lautet: <br>"
@@ -9492,5 +9519,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9508,15 +9535,8 @@
 msgstr "OSM-Server-Dateien (gzip-komprimiert)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "notwendiges Attribut \"{0}\" fehlt"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ 64-Bit-"
@@ -9526,5 +9546,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive 64-"
@@ -9533,5 +9554,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
@@ -9540,5 +9561,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive "
@@ -9548,5 +9569,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
@@ -9556,6 +9577,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
@@ -9564,5 +9585,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
 msgid "Parsing OSM history data ..."
-msgstr "Lese OSM-Verlaufsdaten ein..."
+msgstr "OSM-Versionsprotokoll einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -9570,30 +9591,33 @@
 msgstr "Fehler beim Parsen."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Die Datei \"{0}\" existiert nicht"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
-msgstr ""
-"Fehlendes obligatorisches Attribut des \"bounds\"-Elements. Eingelesen wurde "
-"minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+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:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 "Ungültiger Wert des Attributs \"ref\" im Element <nd>. Wert lautete {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 "XML-Element <member> wurde nicht als direktes Kind des Elements <relation> "
@@ -9602,5 +9626,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
 
@@ -9614,5 +9638,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
 
@@ -9633,7 +9657,9 @@
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
+"Während des Einlesens wurde ein undefiniertes Element \"{0}\" gefunden. "
+"Dieses wird ignoriert."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Illegales Objekt mit id=0"
 
@@ -9642,40 +9668,29 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#, java-format
+msgid ""
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 "WARNUNG: setze den Wert des Attributs ''version'' für das XML Element {0} "
-"auf den Standardwert 1. Die Version des API ist ''0.5''. Der Wert von "
+"auf den Standardwert {2}. Die Version des API ist ''{3}''. Der Wert von "
 "''version'' war {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
 
 #. should not happen. API version has been checked before
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+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:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
 
@@ -9687,5 +9702,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
 
@@ -9693,22 +9708,18 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
-msgstr ""
-"Der Weg mit der externen ID ''{0}'' enthält einen Knoten mit externer ID "
-"''{1}'', der im Datenstrom nicht gefunden wurde."
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
-msgstr ""
-"Der Weg {0} mit {1} Knoten wurde als unvollständig markiert weil mindestens "
-"einer der referenzierten Knoten nicht in den geladenen Daten enthalten war."
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 "Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
@@ -9719,8 +9730,6 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
-msgstr ""
-"Die Relation mit externer ID ''{0}'' referenziert ein nicht vorhandendes OSM "
-"Element mit externer ID ''{1}''"
+"id ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
@@ -9738,11 +9747,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr "Parameter ''{0}'' > 0 verlangt. Erhielt {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -9756,23 +9760,23 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Änderungssetze einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Änderungssätze herunterladen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Änderungssatz {0} einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Änderungssatz {0} herunterladen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 "nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
@@ -9780,5 +9784,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
 msgid "Downloading history..."
-msgstr "Historie herunterladen..."
+msgstr "Versionsprotokoll herunterladen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
@@ -9788,14 +9792,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Verbindung  zu API {0} konnte nicht geöffnet werden"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
 msgid "Error: failed to add authentication credentials to the connection."
-msgstr ""
+msgstr "Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
@@ -9803,5 +9807,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9811,5 +9815,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9819,5 +9823,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9860,5 +9864,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10300,5 +10304,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10381,5 +10385,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10390,5 +10394,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10399,5 +10403,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10409,5 +10413,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10418,5 +10422,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10564,4 +10568,137 @@
 msgstr "GPS-Spuren zu openstreetmap.org hochladen"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Adressinterpolation"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr "Praktische Funktionen zur Adressinterpolation"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr "Adressinterpolation festlegen"
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "ungerade"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "gerade"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr "Alphabetisch"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr "Relation: {0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr "Mit Straße verknüpfen per:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr "Nummerierungsschema:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr "Startnummer:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr "Endnummer:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr "{0} zusätzliche Hausnummern-Knoten werden verküpft"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr "Stadt:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr "Bundesland/-staat:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr "Postleitzahl:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr "Land:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr "Optionale Adressinformationen:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+"Wählen Sie bitte eine Straße, die mit dem Weg zur Adressinterpolation "
+"verknüpft werden soll"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+"Wählen Sie bitte einen Weg zur Adressinterpolation, der mit dieser Straße "
+"verknüpft werden soll"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr "Ungerade Hausnummern erwartet"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr "Gerade Hausnummern erwartet"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr "Ländercode muss aus 2 Buchstaben bestehen"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr "Bitte eine gültige Nummer für die Start und Ende eingeben"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr "Alphabetische Adressen müssen mit einem Buchstaben aufhören"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr "Der Startbuchstabe muss im Alphabet vor dem Endbuchstaben liegen."
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr "Bitte eine gültige Nummer für die Startnummer eingeben"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr "Bitte eine gültige Nummer für die Endnummer eingeben"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr "Die Startnummer muss kleiner als die Endnummer sein."
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10680,4 +10817,9 @@
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kann \"{0}\" nicht lesen"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10981,13 +11123,13 @@
 msgstr "Wähle aus..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11000,13 +11142,13 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11018,5 +11160,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29
 msgid "Replace original background by JOSM background color."
-msgstr "Ersetze die originalen Hintergrundfarben mit JOSM-Farben"
+msgstr "Originale Hintergrundfarbe durch JOSM-Farbe ersetzen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -11026,5 +11168,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Set background transparent."
-msgstr "Aktiviere transparenten Hindergrund"
+msgstr "Transparenten Hintergrund aktivieren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
@@ -11035,5 +11177,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174
 msgid "Disable image cropping during georeferencing."
-msgstr "Deaktiviere die Bildbeschneidung während des Georeferenzierens."
+msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
@@ -11056,7 +11198,7 @@
 "Eine spezielle Schnittstelle für das französische Kataster-WMS auf www."
 "cadastre.gouv.fr<BR><BR>Bitte lesen Sie die Nutzungsbedingungen (auf "
-"französisch):<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"Französisch):<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
 "CU_01_ConditionsGenerales_fr.html\">http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a><BR>bevor SIe Daten die mit Hilfe "
+"CU_01_ConditionsGenerales_fr.html</a><BR>bevor Sie Daten, die mit Hilfe "
 "dieses Plugins erstellt wurden, hochladen."
 
@@ -11187,5 +11329,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
-msgstr "Cadastare WMS wird kontaktiert..."
+msgstr "Kataster-WMS wird kontaktiert..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
@@ -11198,6 +11340,6 @@
 "Use the normal Cadastre Grab menu."
 msgstr ""
-"Gemeinde ist vektorsiert!\n"
-"Benutze das normale Cadastre Menü."
+"Gemeinde ist vektorisiert!\n"
+"Benutze das normale Cadastre-Menü."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
@@ -11231,5 +11373,5 @@
 "projections and retry"
 msgstr ""
-"Um das Cadastre-WMS-Plugin zu aktivieren, muss\n"
+"Um das Kataster-WMS-Plugin zu aktivieren, muss\n"
 "die derzeitige Projektion in eine von Cadastre\n"
 "unterstützte Projektion geändert werden."
@@ -11287,5 +11429,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
 msgid "Enter cadastre east,north position"
-msgstr "Gib die Cadastre Ost,Nord-Position ein"
+msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250
@@ -11304,5 +11446,5 @@
 #, java-format
 msgid "Set {0} Lambert coordinates"
-msgstr ""
+msgstr "Setze {0} Lambert-Koordinaten"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11394,28 +11536,28 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11427,9 +11569,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11438,5 +11580,5 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
@@ -12236,51 +12378,54 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 msgid "Michigan Left"
-msgstr ""
+msgstr "Michigan Left"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
 msgid "Please select 4 or 5 ways to assign no left turns."
 msgstr ""
+"Bitte 4 oder 5 Wege auswählen, zu denen  Abbiegeverbote nach links "
+"hinzugefügt werden sollen."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
 #, java-format
 msgid "{0} extrem nodes."
-msgstr ""
+msgstr "{0} extreme Knoten."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
 #, java-format
 msgid "Via node {0}, {1}"
-msgstr ""
+msgstr "Via Knoten {0}, {1}"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
 #, java-format
 msgid "{0} via nodes."
-msgstr ""
+msgstr "{0} via-Knoten"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
 msgid "Unable to find via nodes. Please check your selection"
 msgstr ""
+"Kreuzungspunkt (via-node) konnte nicht gefunden werden. Prüfe deine Auswahl."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
 #, java-format
 msgid "MIddle way: {0}"
-msgstr ""
+msgstr "Mittlerer Weg: {0}"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
 msgid "Create Michigan left turn restriction"
-msgstr ""
+msgstr "Michigan Abbiegeverbote nach links erstellen"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
 #, java-format
 msgid "Processing {0}"
-msgstr ""
+msgstr "{0} verarbeiten"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
 #, java-format
 msgid "Relation: from {0} to {1} via {2}"
-msgstr ""
+msgstr "Relation: von {0} über {2} nach {1}"
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -12853,13 +12998,4 @@
 msgstr "Abteilen"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "gerade"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "ungerade"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12883,41 +13019,4 @@
 msgid "Optional"
 msgstr "Optional"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Nutzer"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Autorenpanel anzeigen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Nutzerseite öffnen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Nutzerseite im Browser öffnen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Nutzerdaten auswählen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Ersetze Auswahl mit Nutzerdaten"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Bitte wählen Sie einige Daten"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Bitten verwenden Sie das Autorenpanel um einen Nutzer zu wählen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Dies funktioniert nicht mit anonymen Nutzern"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -13098,10 +13197,10 @@
 msgstr "Keine Fehler gefunden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Raster"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -13183,12 +13282,30 @@
 msgstr "Datenprüfung: Andere"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr "Test {0} ausführen"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Prüfung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Datenprüfung ausführen"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr "Validieren"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr "Test {0}/{1}: {2} starten"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr "Ignorierte Fehler aktualisieren..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13258,21 +13375,21 @@
 msgstr "\"{0}\" mit \"{1}\" ersetzen für"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Küsten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Dieser Test überprüft, ob die Küsten korrekt sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Ungeordnete Küsten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Überschneidende Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13283,35 +13400,35 @@
 "sein."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Überschneidende Gebäude"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Überschneidende Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Doppelte Knoten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Knoten auf derselben Position"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Überlappende Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13321,5 +13438,5 @@
 "Koordinaten liegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Überlappende Wege löschen"
@@ -13337,10 +13454,10 @@
 msgstr "Knoten doppelt im Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Knoten mit demselben Namen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -13348,9 +13465,9 @@
 "hinweisen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Überlappende Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13360,29 +13477,29 @@
 "als einem Weg verwendet wird."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Überlappende Flächen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Überlappende Straßen (mit Fläche)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Überlappende Schienen (mit Fläche)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Überlappende Wege (mit Fläche)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Überlappende Straßen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Überlappende Schienen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Überlappende Wege"
@@ -13399,10 +13516,10 @@
 "Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Ähnlich benannte Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13411,23 +13528,23 @@
 "könnte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Eigenschaftsprüfer:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ungültige Zeile im Merkmalsprüfer - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ungültige Zeile im Rechtschreibprüfer: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13438,7 +13555,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ungültige Schlüssel/Wert-Kombinationen"
@@ -13446,80 +13563,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Zeichenproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Schlüssel \"{0}\" ungültig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Merkmale mit leerem Wert"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ungültiger Schlüssel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Werte enthalten HTML-Entität"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Vorlagen enthalten Schlüssel nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Vorlagen enthalten Wert nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "Korrekturnotizen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Schlüssel prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Komplexen Eigenschaftsprüfer verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Datenquelle für Merkmalsprüfer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13529,29 +13646,29 @@
 "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Datenquellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Werte überprüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Auf Korrekturnotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -13559,103 +13676,103 @@
 "(fixme) stehen haben."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Zeichennotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Standarddatendatei verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Nutzung der Standarddatendatei (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr "Standarddatei zum Merkmale ignorieren verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 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:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Standarddatei für Schreibprüfung verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Eigenschaften korrigieren"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Konnte Elementtyp nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Konnte Warnlevel nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ungültiger Ausdruck \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ungültiger regulärer Ausdruck \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Nicht geschlossene Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Testen, ob kreisförmige Wege korrekt geschlossen sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "Naturflächentyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "Landnutzungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "Einrichtungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "Sportart {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "Tourismustyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "Geschäftstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "Erholungstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13751,5 +13868,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13765,18 +13882,18 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "Fläche"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Nicht geschlossener Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Unverbundene Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13784,26 +13901,26 @@
 "hat."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "Wegende nahe anderer Straße"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "Wegende nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Wegpunkt nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Verbundenes Wegende nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Knoten ohne Merkmale und ohne Verbindung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13811,9 +13928,9 @@
 "sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Leere Wege, 1-Knoten-Wege und Wege ohne Merkmale."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
@@ -13821,41 +13938,41 @@
 "Wege ohne Merkmale."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Unbenannte Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Unbenannte Kreuzung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Wege ohne Merkmale"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Leere Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Wege, die nur aus einem Knoten bestehen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Falsch geordnete Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Dieser Test überprüft die Richtung von Wasser, Land und Küsten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Verdrehtes Land: Land nicht auf der linken Seite"
@@ -14292,6 +14409,11 @@
 "hochzuladen."
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster."
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14302,5 +14424,5 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -14308,5 +14430,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14323,10 +14445,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Erzeugt ein Wegegitter."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14336,10 +14458,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Ermöglicht den direkten Import verschiedener Dateiformate in JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14350,10 +14472,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Wege mit einem Versatz duplizieren."
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14364,5 +14486,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14370,15 +14492,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualisiert Routeninformationen als Routengraph."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14391,10 +14513,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14404,5 +14526,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14415,10 +14537,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
+msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu"
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14431,15 +14553,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14449,5 +14571,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14456,5 +14578,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14465,15 +14587,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14484,10 +14606,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14498,15 +14620,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14519,17 +14641,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Ein Werkzeug, um mit Autoren oder Nutzern zu arbeiten. Auswählen von "
-"Kartendaten, welche der Nutzer bearbeitet hat oder Öffnen des Browsers mit "
-"Nutzerprofilen."
 
 #. Plugin utilsplugin
@@ -14625,5 +14737,5 @@
 #: build/trans_presets.java:57
 msgid "Highways"
-msgstr ""
+msgstr "Straßen"
 
 #. group "Highways"
@@ -17259,5 +17371,5 @@
 #: build/trans_presets.java:1250
 msgid "Transport"
-msgstr ""
+msgstr "Transport"
 
 #. group "Transport"
@@ -18077,5 +18189,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Reisen"
 
 #. group "Travel"
@@ -18699,10 +18811,10 @@
 #: build/trans_presets.java:1852
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Grenzstein"
 
 #. item
 #: build/trans_presets.java:1853
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -19511,4 +19623,24 @@
 msgstr "Stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr "Weg"
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19861,5 +19993,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr ""
+msgstr "Zivilisationsbauten"
 
 #. group "Man-Made"
@@ -20263,10 +20395,4 @@
 msgid "Country code"
 msgstr "Länderkennung"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Adressinterpolation"
 
 #. item
@@ -21355,5 +21481,5 @@
 #: build/trans_presets.java:2758
 msgid "Geography"
-msgstr ""
+msgstr "Geografie"
 
 #. group "Places"
@@ -26432,6 +26558,9 @@
 msgstr "Tschechien UHUL:ORTOFOTO"
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
+#~ msgid "No data imported."
+#~ msgstr "Keine Daten importiert."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Ungespeicherte Änderungen"
 
 #~ msgid "All the ways were empty"
@@ -26501,4 +26630,31 @@
 #~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
 
+#~ msgid "User"
+#~ msgstr "Nutzer"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Autorenpanel anzeigen"
+
+#~ msgid "Open User Page"
+#~ msgstr "Nutzerseite öffnen"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Nutzerseite im Browser öffnen"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Nutzerdaten auswählen"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Ersetze Auswahl mit Nutzerdaten"
+
+#~ msgid "Please select some data"
+#~ msgstr "Bitte wählen Sie einige Daten"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Bitten verwenden Sie das Autorenpanel um einen Nutzer zu wählen"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Dies funktioniert nicht mit anonymen Nutzern"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Autoren: {0}"
@@ -26538,6 +26694,11 @@
 #~ msgstr "Tafeltyp"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- aktive Version ist {0}"
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Ein Werkzeug, um mit Autoren oder Nutzern zu arbeiten. Auswählen von "
+#~ "Kartendaten, welche der Nutzer bearbeitet hat oder Öffnen des Browsers "
+#~ "mit Nutzerprofilen."
 
 #~ msgid "Version number missing from OSM data"
@@ -26548,4 +26709,7 @@
 #~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der "
 #~ "Relation {1}"
+
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
 
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
@@ -26676,4 +26840,15 @@
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Neuen Änderungssatz erstellen und danach schließen"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "{0} Ebene enthält ungespeicherte Änderungen. Diese Änderungen verwerfen "
+#~ "und fortfahren?"
+#~ msgstr[1] ""
+#~ "{0} Ebenen enthalten ungespeicherte Änderungen. Diese Änderungen "
+#~ "verwerfen und fortfahren?"
 
 #~ msgid "There is currently no changeset open."
@@ -26727,2 +26902,5 @@
 #~ msgid "not yet decided"
 #~ msgstr "Noch ohne Lösung"
+
+#~ msgid "Missing mandatory attribute ''{0}''"
+#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\""
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/el.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:03+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:35+0000\n"
 "Last-Translator: logictheo <towardsoss@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Βοήθεια"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Η προβολή {0} δεν μπορούσε να ενεργοποιηθεί. Χρησιμοποιώ το Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Σφάλμα"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Μη αποθηκευμένες αλλαγές"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Αποθήκευση και Έξοδος"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Απόρριψη και Έξοδος"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Προειδοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -393,4 +327,52 @@
 msgid "Merge"
 msgstr "Συγχώνευση"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Ακύρωση"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -484,4 +466,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -496,5 +479,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -531,6 +514,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -552,41 +535,4 @@
 msgid "Please select at least three nodes."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον τρείς κόμβους."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων είναι "
-"{0}, μέγιστος είναι {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Παραβίαση Δυνατοτήτων API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Παραβίαση Προυποθέσεων"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -655,5 +601,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -763,5 +709,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -777,5 +723,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -826,8 +772,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -998,5 +946,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr ""
 
@@ -1004,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1034,5 +982,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -1719,14 +1667,14 @@
 msgstr "Κενή επιλογή"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Αποστολή προς OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1735,23 +1683,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Συγχρονισμός μόνο {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1765,17 +1713,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1786,16 +1734,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1804,23 +1753,23 @@
 "αναμενόμενο πρότυπο \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Η αποστολή στο OSM API απέτυχε"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1932,8 +1881,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Δεν εισήχθησαν δεδομένα"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2461,4 +2406,65 @@
 msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων είναι "
+"{0}, μέγιστος είναι {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Παραβίαση Δυνατοτήτων API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Παραβίαση Προυποθέσεων"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2560,6 +2566,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2584,5 +2590,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2638,5 +2644,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2644,6 +2650,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2655,5 +2661,5 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2927,5 +2933,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2944,18 +2950,21 @@
 msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "Ν"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "Β"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "Δ"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "Α"
@@ -2969,41 +2978,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3021,29 +3052,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3053,33 +3085,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3092,12 +3125,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3105,5 +3132,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3253,5 +3280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3262,5 +3289,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3271,5 +3298,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3755,5 +3782,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
@@ -3816,5 +3843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3914,5 +3941,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3920,15 +3947,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα"
 
@@ -3986,5 +4013,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3992,5 +4019,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3998,13 +4025,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4012,5 +4040,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4027,5 +4055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση"
 
@@ -4036,5 +4064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση"
 
@@ -4049,5 +4077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 "Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
@@ -4060,5 +4088,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων"
 
@@ -4068,5 +4096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης"
 
@@ -4074,5 +4102,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4080,5 +4109,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4109,6 +4138,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4116,5 +4145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4124,5 +4153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4130,5 +4159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4323,5 +4352,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4382,5 +4411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4388,5 +4417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4496,14 +4525,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4512,7 +4541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4577,5 +4604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4598,4 +4625,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4753,5 +4785,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4809,5 +4841,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4845,5 +4877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4913,5 +4945,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<διαφορετικά>"
@@ -5141,6 +5173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5192,5 +5223,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5416,4 +5446,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5447,5 +5481,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5717,5 +5756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5723,19 +5762,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5743,9 +5786,4 @@
 msgid "Load history"
 msgstr "Φόρτωση ιστορικού"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6857,4 +6895,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Απόρριψη και Έξοδος"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6868,4 +6910,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Αποθήκευση και Έξοδος"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7086,6 +7132,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7201,36 +7250,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "σημείο gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7238,5 +7287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7245,5 +7294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7278,4 +7327,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7334,5 +7384,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
@@ -7347,5 +7397,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7353,5 +7403,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7456,5 +7506,5 @@
 msgstr "Μετατροπή σε επίπεδο GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7462,28 +7512,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "ίχνος"
-msgstr[1] "ίχνη"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7491,5 +7525,5 @@
 msgstr[1] "σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7498,5 +7532,5 @@
 msgstr[1] "ένα ίχνος με {0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7505,5 +7539,5 @@
 msgstr[1] "το {0} αποτελείται από {1} ίχνη"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7637,5 +7671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
@@ -7651,5 +7685,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7819,4 +7853,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8363,5 +8398,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
@@ -8551,33 +8586,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Χρήση προεπιλογής \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8588,15 +8624,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8606,18 +8642,18 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Αλλαγή ιδιοτήτων"
@@ -8647,10 +8683,4 @@
 msgstr "Μεταφόρτωση σημείων {0} ως {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8664,11 +8694,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
@@ -8687,5 +8716,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "περιγραφή ίχνους gps"
 
@@ -8749,5 +8778,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8760,5 +8788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
@@ -8770,5 +8798,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8820,5 +8848,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8858,5 +8886,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8874,5 +8902,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8880,5 +8908,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8886,5 +8914,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8896,10 +8924,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8918,5 +8940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8948,20 +8970,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8974,5 +8991,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8989,6 +9006,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8999,15 +9022,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9015,11 +9038,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9038,5 +9055,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9116,5 +9133,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9122,5 +9139,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9136,15 +9153,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9152,10 +9162,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9163,5 +9174,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9169,5 +9180,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9175,6 +9186,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9187,32 +9198,37 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9224,5 +9240,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9243,5 +9259,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Άγνωστο αντικείμενο με id=0"
 
@@ -9250,26 +9266,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9277,10 +9282,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9292,5 +9297,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9298,5 +9303,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9304,6 +9309,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9311,5 +9316,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9318,5 +9323,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9335,10 +9340,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9371,5 +9371,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9384,5 +9384,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9393,5 +9393,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο "
@@ -9399,5 +9399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9407,5 +9407,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9415,5 +9415,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9454,5 +9454,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9860,5 +9860,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9931,5 +9931,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9938,5 +9938,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9945,5 +9945,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9952,5 +9952,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9959,5 +9959,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10097,4 +10097,133 @@
 msgstr "Αποστολή ιχνών στο openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Παρεμβολή Διευθύνσεων"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Μονά"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Ζυγά"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10213,4 +10342,9 @@
 msgid "Error while parsing {0}"
 msgstr "Σφάλμα κατά την ερμηνεία {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10495,13 +10629,13 @@
 msgstr "Επιλέξτε από..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10510,13 +10644,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10876,28 +11010,28 @@
 msgstr "Άδειο επίπεδο"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Δεν είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10906,14 +11040,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12300,13 +12434,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Ζυγά"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Μονά"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12330,41 +12455,4 @@
 msgid "Optional"
 msgstr "Προαιρετικό"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Χρήστης"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Εμφάνιση πίνακα Συγγραφέα"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Άνοιγμα σελίδας χρήστη"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Άνοιγμα Σελίδας Χρήστη στον φυλλομετρητή"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Επιλογή δεδομένων χρήστη"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Αντικαθιστά την επιλογή με τα στοιχεία χρήστη"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Παρακαλώ επιλέξτε κάποια δεδομένα"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12535,10 +12623,10 @@
 msgstr "Κανένα σφάλμα επαλήθευσης"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Πλέγμα"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12618,12 +12706,30 @@
 msgstr "άλλο επαλήθευσης"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Επαλήθευση"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Πραγματοποιεί επαλήθευση δεδομένων"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12693,21 +12799,21 @@
 msgstr "Αντικατάσταση \"{0}\" με \"{1}\" για"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Ακτογραμμές."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Αυτή η δοκιμή ελέγχει ότι οι ακτογραμμές είναι σωστές."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12715,35 +12821,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12751,5 +12857,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12767,18 +12873,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Κόμβοι με το ίδιο όνομα"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12786,29 +12892,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Αλληλοκαλυπτόμενες περιοχές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12824,33 +12930,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Ελεγκτής ιδιοτήτων:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12861,7 +12967,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12869,80 +12975,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Το κλειδί \"{0}\" δεν είναι έγκυρο."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Ετικέτες χωρίς τιμές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12950,130 +13056,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "Προσθήκη νέας πηγής στην λίστα."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Πηγές δεδομένων"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Έλεγχος για FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Διόρθωση ιδιοτήτων"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Δεν βρέθηκε ο τύπος του στοιχείου"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13169,5 +13275,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13183,91 +13289,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Κόμβοι ασύνδετοι και χςρίς ετικέτες"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "Ανάποδη ακτογραμμή: η ξηρά δεν είναι στην αριστερή πλευρά"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13658,6 +13764,11 @@
 msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13666,10 +13777,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13681,10 +13792,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13692,10 +13803,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Επιτρέπει την εισαγωγή διαφόρων τύπων αρχείων απ' ευθείας στο JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13704,10 +13815,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13716,20 +13827,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13739,10 +13850,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13750,5 +13861,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13758,10 +13869,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13771,15 +13882,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13787,5 +13898,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13793,5 +13904,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13800,15 +13911,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13817,10 +13928,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13829,15 +13940,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13847,13 +13958,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18826,4 +18930,24 @@
 msgstr "στάδιο"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19578,10 +19702,4 @@
 msgid "Country code"
 msgstr "Κωδικός χώρας"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Παρεμβολή Διευθύνσεων"
 
 #. item
@@ -25763,4 +25881,7 @@
 #~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Μη αποθηκευμένες αλλαγές"
+
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -25794,4 +25915,7 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "Άγνωστη επέκταση αρχείου."
+
+#~ msgid "No data imported."
+#~ msgstr "Δεν εισήχθησαν δεδομένα"
 
 #~ msgid "Contacting the OSM server..."
@@ -25950,4 +26074,19 @@
 #~ msgstr "Επαλήθευση"
 
+#~ msgid "User"
+#~ msgstr "Χρήστης"
+
+#~ msgid "Open User Page"
+#~ msgstr "Άνοιγμα σελίδας χρήστη"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Αντικαθιστά την επιλογή με τα στοιχεία χρήστη"
+
+#~ msgid "Please select some data"
+#~ msgstr "Παρακαλώ επιλέξτε κάποια δεδομένα"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Επιλογή δεδομένων χρήστη"
+
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO (GNOME)"
@@ -26057,4 +26196,7 @@
 #~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS"
 
+#~ msgid "Show Author Panel"
+#~ msgstr "Εμφάνιση πίνακα Συγγραφέα"
+
 #~ msgid "Map Type"
 #~ msgstr "Τύπος Χάρτη"
@@ -26062,4 +26204,54 @@
 #~ msgid "Edit Information Office"
 #~ msgstr "Επεξεργασία Γραφείου Πληροφοριών"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
+#~ "επίπεδο δεδομένων;"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον "
+#~ "διακομιστή."
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Αποτυχία αρχικοποίησης API"
+
+#~ msgid "Update failed"
+#~ msgstr "Αποτυχία ενημέρωσης"
+
+#~ msgid "nodes"
+#~ msgstr "κόμβοι"
+
+#~ msgid "relations"
+#~ msgstr "σχέσεις"
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Εφαρμογή μερικών επιλύσεων"
+
+#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}"
+#~ "</html>"
+
+#~ msgid "Error when communicating with server."
+#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
+
+#~ msgid "Continue anyway"
+#~ msgstr "Συνέχεια έτσι κι αλλιώς"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Άνοιγμα Σελίδας Χρήστη στον φυλλομετρητή"
+
+#~ msgid "% of lon:"
+#~ msgstr "% γεωγ. μήκους:"
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -26074,46 +26266,2 @@
 #~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
 #~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
-#~ "επίπεδο δεδομένων;"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον "
-#~ "διακομιστή."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Αποτυχία αρχικοποίησης API"
-
-#~ msgid "Update failed"
-#~ msgstr "Αποτυχία ενημέρωσης"
-
-#~ msgid "nodes"
-#~ msgstr "κόμβοι"
-
-#~ msgid "relations"
-#~ msgstr "σχέσεις"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Εφαρμογή μερικών επιλύσεων"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}"
-#~ "</html>"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Συνέχεια έτσι κι αλλιώς"
-
-#~ msgid "% of lon:"
-#~ msgstr "% γεωγ. μήκους:"
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 17764)
@@ -10,6 +10,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-20 01:36+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:18+0000\n"
 "Last-Translator: Bruce Cowan <lp@bcowan.fastmail.co.uk>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -27,5 +27,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -34,14 +34,14 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "The projection {0} could not be activated. Using Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -78,6 +78,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -92,4 +92,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -105,6 +110,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -112,84 +117,11 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgstr[1] ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Unsaved Changes"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Save and Exit"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Discard and Exit"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -211,7 +143,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -225,5 +157,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -250,13 +182,13 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -403,4 +335,52 @@
 msgid "Merge"
 msgstr "Merge"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Cancel"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -496,4 +476,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -508,5 +489,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -543,6 +524,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -564,45 +545,4 @@
 msgid "Please select at least three nodes."
 msgstr "Please select at least three nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "API Capabilities Violation"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Precondition Violation"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -671,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -787,5 +727,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -801,5 +741,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -849,8 +789,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1021,5 +963,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameter ''{0}'' must not be null"
 
@@ -1027,5 +969,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 
@@ -1057,5 +999,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Edit"
@@ -1755,14 +1697,14 @@
 msgstr "Selection empty"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Upload to OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Upload all changes to the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1773,23 +1715,23 @@
 "resolve them first.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronize {0} {1} only"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchronize entire dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1810,17 +1752,17 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Conflict detected"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "unexpected return value. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1835,42 +1777,40 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-"<html>Uploading <strong>failed</strong> because you've been "
-"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr "Changeset closed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Upload to OSM API failed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Updating primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1983,8 +1923,4 @@
 msgstr ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "No data imported."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2529,4 +2465,69 @@
 msgstr "Error while communicating with server."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API Capabilities Violation"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Precondition Violation"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2630,9 +2631,7 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr "already registered a conflict for primitive ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2657,5 +2656,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "cannot resolve undecided conflict"
 
@@ -2715,5 +2714,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Split way segment"
@@ -2721,6 +2720,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2732,5 +2731,5 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Delete confirmation"
@@ -2838,7 +2837,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Resolve conflicts in node list of way {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3027,5 +3026,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "already registered a conflict for primitive ''{0}''"
 
@@ -3044,18 +3043,21 @@
 msgstr "Degrees Minutes Seconds"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3069,41 +3071,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 required. Got {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr "H"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr "Text"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr "C"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr "M"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr "R"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr "D"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr "F"
@@ -3121,29 +3145,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "expected id >= 0. Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+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:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
-msgstr "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "version > 0 expected. Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
 
@@ -3153,35 +3178,36 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
+msgstr ""
 "tag collection can't be applied to a primitive because there are keys with "
 "multiple values"
-msgstr ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
-msgstr "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{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"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "no latest version found. History is empty."
 
@@ -3194,12 +3220,6 @@
 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/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
 
@@ -3207,5 +3227,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
@@ -3358,5 +3378,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3367,5 +3387,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3376,5 +3396,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3868,5 +3888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "layer not in list."
 
@@ -3930,5 +3950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "role {0} is not participating in compare pair {1}"
 
@@ -4031,5 +4051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "parameter current out of range: got {0}"
 
@@ -4037,15 +4057,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "list in role {0} is currently not participating in a compare pair"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "unexpected value of parameter \"index\". Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "item {0} not found in list"
 
@@ -4103,30 +4123,31 @@
 
 #: ../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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "Copy my selected elements to the end of the list of merged elements"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
 "Copy my selected elements before the first selected element in the list of "
 "merged elements"
-msgstr ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
 "Copy my selected elements after the first selected element in the list of "
 "merged elements"
-msgstr ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copy their selected element to the start of the list of merged elements"
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "Copy their selected elements to the end of the list of merged elements"
 
@@ -4134,5 +4155,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copy their selected elements before the first selected element in the list "
@@ -4153,5 +4174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Move up the selected elements by one position"
 
@@ -4162,5 +4183,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Move down the selected entries by one position"
 
@@ -4175,5 +4196,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Remove the selected entries from the list of merged elements"
 
@@ -4185,5 +4206,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Freeze the current list of merged elements"
 
@@ -4193,5 +4214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Unfreeze the list of merged elements and start merging"
 
@@ -4199,12 +4220,13 @@
 #, java-format
 msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr ""
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
-msgstr ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4237,15 +4259,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4254,5 +4274,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr "Merged nodes not frozen yet. Can't build resolution command"
 
@@ -4260,5 +4280,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "unexpected column index. Got {0}"
 
@@ -4467,5 +4487,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "merged nodes not frozen yet. Can't build resolution command"
 
@@ -4526,5 +4546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "cannot apply undecided tag merge item"
 
@@ -4532,5 +4552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parameter 'col' must be 0 or 1. Got {0}"
 
@@ -4640,14 +4660,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "parameter ''{0}'' must not be empty"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "tag collection doesn't include the selected value ''{0}''"
 
@@ -4656,91 +4676,94 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "Not decided yet"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Tags from nodes"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Tags from ways"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Tags from relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Conflicts in pasted tags"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} way"
+msgstr[1] "{0} ways"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} relation"
+msgstr[1] "{0} relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "Paste ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "From ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "To ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} tag"
+msgstr[1] "{0} tags"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr "pos {0} is out of range. current number of members: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr "Remove this relation member from the relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
 msgstr "Not decided yet"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "Tags from nodes"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "Tags from ways"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "Tags from relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "Conflicts in pasted tags"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} way"
-msgstr[1] "{0} ways"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} relation"
-msgstr[1] "{0} relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr "Paste ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "From ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "To ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-msgstr[0] "{0} tag"
-msgstr[1] "{0} tags"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
-#, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
-msgstr "pos {0} is out of range. current number of members: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-msgid "Remove this relation member from the relation"
-msgstr "Remove this relation member from the relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-msgid "Undecided"
-msgstr ""
 
 #. --- role editing
@@ -4901,5 +4924,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4957,5 +4980,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "index out of bounds Got {0}"
 
@@ -4993,5 +5016,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Display the history of the selected primitive"
 
@@ -5061,5 +5084,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<different>"
@@ -5286,6 +5309,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Edit the relation the currently selected relation member refers to"
 
@@ -5339,5 +5361,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5589,4 +5610,8 @@
 msgstr "Confirm empty role"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Edit the relation the currently selected relation member refers to"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5620,6 +5645,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5888,5 +5918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr "history not initialised yet. Failed to set reference primitive."
 
@@ -5894,20 +5924,24 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "failed to set reference. reference version {0} not available in history"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+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:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr "failed to set current. current version {0} not available in history"
 
@@ -5915,9 +5949,4 @@
 msgid "Load history"
 msgstr "Load history"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -7029,4 +7058,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Discard and Exit"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7040,4 +7073,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Save and Exit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7260,6 +7297,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7375,36 +7415,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps point"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Use global settings."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7412,5 +7452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7419,5 +7459,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7452,4 +7492,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7508,5 +7549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
@@ -7521,5 +7562,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7527,5 +7568,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7633,5 +7674,5 @@
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7639,28 +7680,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "track"
-msgstr[1] "tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7668,5 +7693,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7675,5 +7700,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7682,5 +7707,5 @@
 msgstr[1] "{0} consists of {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7815,5 +7840,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Please select the row to edit."
@@ -7829,5 +7854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8009,4 +8034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8561,5 +8587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Delete the selected source from the list."
@@ -8771,33 +8797,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Use preset ''{0}'' of group ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Use preset ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "closed way"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8808,15 +8835,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8826,18 +8853,18 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Change Properties"
@@ -8867,10 +8894,4 @@
 msgstr "Downloading points {0} to {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8884,11 +8905,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr "Could not export \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Could not read \"{0}\""
 
@@ -8907,5 +8927,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "gps track description"
 
@@ -8969,5 +8989,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8980,5 +8999,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: invalid document structure for gpx document"
 
@@ -8990,5 +9009,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr "no primitive with id {0} in local dataset. Can't infer primitive type"
 
@@ -9040,5 +9059,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Server replied with response code 404, retrying with an individual request "
@@ -9080,5 +9099,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "preference ''{0}'' missing. Can't initialize OsmApi"
 
@@ -9098,5 +9117,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Communications with {0} established using protocol version {1}"
 
@@ -9104,5 +9123,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "unexpected format of id replied by the server, got ''{0}''"
 
@@ -9110,5 +9129,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
@@ -9121,10 +9140,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9143,5 +9156,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "No changeset present for diff upload"
 
@@ -9173,20 +9186,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9199,5 +9207,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "The server replied an error with code {0}"
 
@@ -9214,7 +9222,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "mandatory attribute ''{0}'' missing"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9224,15 +9238,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9240,11 +9254,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9263,5 +9271,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9343,5 +9351,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
 
@@ -9349,5 +9357,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9365,15 +9373,8 @@
 msgstr "OSM Server Files gzip compressed"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "mandatory attribute ''{0}'' missing"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
@@ -9382,11 +9383,12 @@
 #, java-format
 msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
 "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
 
@@ -9394,20 +9396,20 @@
 #, java-format
 msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
+msgstr ""
 "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
 #, java-format
 msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
 "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
@@ -9422,32 +9424,37 @@
 msgstr "Error during parse."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "File \"{0}\" does not exist"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9459,5 +9466,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9478,5 +9485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Illegal object with id=0"
 
@@ -9485,26 +9492,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9512,10 +9508,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9527,5 +9523,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9533,5 +9529,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9539,14 +9535,12 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
-msgstr ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9555,5 +9549,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9572,11 +9566,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "id parameter ''{0}'' > 0 required. Got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr "parameter ''{0}'' > 0 required. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -9608,5 +9597,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
 
@@ -9621,5 +9610,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Failed to open connection to API {0}"
 
@@ -9630,10 +9619,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
+"Couldn't connect to the OSM server. Please check your internet connection."
+msgstr ""
 "Couldn't connect to the osm server. Please check your internet connection."
-msgstr ""
-"Couldn't connect to the osm server. Please check your internet connection."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9643,5 +9632,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9651,5 +9640,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9690,5 +9679,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10104,5 +10093,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10180,5 +10169,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10187,5 +10176,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10194,5 +10183,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10201,5 +10190,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10208,5 +10197,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10348,4 +10337,133 @@
 msgstr "Uploads traces to openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Address Interpolation"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Odd"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Even"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10464,4 +10582,9 @@
 msgid "Error while parsing {0}"
 msgstr "Error while parsing {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Could not read \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10757,13 +10880,13 @@
 msgstr "Choose from..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10775,13 +10898,13 @@
 "Would you like to restore F11 for grab action ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11151,28 +11274,28 @@
 msgstr "Blank Layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Is vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11183,14 +11306,14 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, 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:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
@@ -12589,13 +12712,4 @@
 msgstr "Terrace"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Even"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Odd"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12619,41 +12733,4 @@
 msgid "Optional"
 msgstr "Optional"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "User"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Show Author Panel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Open User Page"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Open User Page in browser"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Select User's Data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Replaces Selection with Users data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Please select some data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Please choose a user using the author panel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Sorry, doesn't work with anonymous users"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12831,10 +12908,10 @@
 msgstr "No validation errors"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Grid"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12916,12 +12993,30 @@
 msgstr "validation other"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Performs the data validation"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12991,21 +13086,21 @@
 msgstr "Replace \"{0}\" by \"{1}\" for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Coastlines."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "This test checks that coastlines are correct."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Unordered coastline"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Crossing ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13013,35 +13108,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Crossing ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicated nodes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "This test checks that there are no nodes at the very same location."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13049,5 +13144,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -13065,18 +13160,18 @@
 msgstr "Duplicated way nodes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Nodes with same name"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "This test finds nodes that have the same name (might be duplicates)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Overlapping ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13086,29 +13181,29 @@
 "than one way."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Overlapping areas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Overlapping highways (with area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Overlapping railways (with area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Overlapping ways (with area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Overlapping highways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Overlapping railways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Overlapping ways"
@@ -13125,10 +13220,10 @@
 "This test checks for ways that contain some of their nodes more than once."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Similarly named ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13136,23 +13231,23 @@
 "This test checks for ways with similar names that may have been misspelt."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Properties checker :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "This plugin checks for errors in property keys and values."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Invalid tagchecker line - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Invalid spellcheck line: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13163,7 +13258,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Illegal tag/value combinations"
@@ -13171,80 +13266,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Painting problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Key ''{0}'' invalid."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Tags with empty values"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Invalid property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Property values contain HTML entity"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 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:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 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:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Check property keys."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Use complex property checker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "TagChecker source"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13254,130 +13349,130 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Data sources"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Check property values."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Check for FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Use default data file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr "Use default tag ignore file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 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:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Use default spellcheck file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Fix properties"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Could not find element type"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Could not find warning level"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Illegal expression ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Illegal regular expression ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Unclosed Ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "This tests if ways which should be circular are closed."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "natural type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "landuse type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "amenities type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "sport type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "tourism type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "shop type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "leisure type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13473,5 +13568,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13487,91 +13582,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "area"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Unclosed way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Unconnected ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Way node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Connected way end node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Untagged and unconnected nodes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "This test checks for untagged nodes that are not part of any way."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Untagged, empty and one node ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "This test checks for untagged, empty and one node ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Unnamed ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Unnamed junction"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Untagged ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Empty ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "One node ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Wrongly Ordered Ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "This test checks the direction of water, land and coastline ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Reversed land: land not on left side"
@@ -13994,6 +14089,11 @@
 msgstr "You must make your edits public to upload new data"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14004,10 +14104,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "A special handler for the French land registry WMS server."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14024,10 +14124,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Create a grid of ways."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14036,10 +14136,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Allows to import various file formats into JOSM directly."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14050,10 +14150,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicate Ways with an offset"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14064,20 +14164,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualizes routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Provide a background layer that displays a map grid"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14090,10 +14190,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14102,5 +14202,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14113,10 +14213,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14129,15 +14229,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14146,5 +14246,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14153,5 +14253,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14162,15 +14262,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14181,10 +14281,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14195,15 +14295,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialog for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14216,16 +14316,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 
 #. Plugin utilsplugin
@@ -19204,4 +19295,24 @@
 msgstr "stadium"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19956,10 +20067,4 @@
 msgid "Country code"
 msgstr "Country code"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Address Interpolation"
 
 #. item
@@ -26125,7 +26230,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' must not be null"
-
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -26134,4 +26236,7 @@
 #~ 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."
@@ -26151,4 +26256,7 @@
 #~ 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:"
@@ -26471,4 +26579,31 @@
 #~ msgstr "Portcullis"
 
+#~ msgid "User"
+#~ msgstr "User"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Replaces Selection with Users data"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Please choose a user using the author panel"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Sorry, doesn't work with anonymous users"
+
+#~ msgid "Open User Page"
+#~ msgstr "Open User Page"
+
+#~ msgid "Please select some data"
+#~ msgstr "Please select some data"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Open User Page in browser"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Select User's Data"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Show Author Panel"
+
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -26614,6 +26749,10 @@
 #~ msgstr "Map Type"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- running version is {0}"
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26631,14 +26770,4 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Remove route nodes"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
 
 #~ msgid "Login name (email) to the OSM account."
@@ -26706,4 +26835,7 @@
 #~ msgstr "Resolve conflicts in member list of relation {0}"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parameter '{0}' must not be null"
+
 #~ msgid ""
 #~ "Properties in the merged element. They will replace properties in my "
@@ -26883,2 +27015,21 @@
 #~ msgstr ""
 #~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgstr[1] ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/es.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:09+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "No se ha podido activar la proyección {0}. Usando Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,86 +115,11 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios y "
-"continuar?"
-msgstr[1] ""
-"Existen cambios sin guardar en las capas {0}. ¿Desea descartar los cambios y "
-"continuar?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Cambios no guardados"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Guardar y salir"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Descartar y salir"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -211,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -225,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -250,13 +180,13 @@
 msgstr "Advertencia"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -400,4 +330,52 @@
 msgid "Merge"
 msgstr "Unir"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -492,4 +470,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -504,5 +483,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -539,6 +518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -561,45 +540,4 @@
 msgstr "Por favor seleccione como mínimo tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"El número de modificaciones actuales supera el máximo de modificaciones, el "
-"actual es {0}, el máximo es {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Violación de la capacidades del API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Advertencia:  automáticamente truncando el valor de la etiqueta \"{0}\" en "
-"la primitiva suprimida {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"La longitud del valor para la etiqueta \"{0}\" en la primitiva {1} excede la "
-"máxima longitud permitida {2}. Los valores de longitud son {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Violación de la condición previa"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} nodos en vía {1} supera el máximo número permitido de nodos {2}"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -652,5 +590,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Cerrar conjuto de cambios abiertos"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -667,5 +605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -782,5 +720,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -796,5 +734,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -846,8 +784,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1019,5 +959,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "el parámetro ''{0}'' no debe ser nulo"
 
@@ -1025,5 +965,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
 
@@ -1055,5 +995,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Editar"
@@ -1761,14 +1701,14 @@
 msgstr "Selección vacía"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1779,23 +1719,23 @@
 "corregirlos primero.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} únicamente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1817,17 +1757,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Conflicto detectado"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1843,16 +1783,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1861,23 +1802,23 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Subida <strong>fallida</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Subida a la API de OSM fallida"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1990,8 +1931,4 @@
 msgstr ""
 "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "No se importó ningún dato."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2553,4 +2490,69 @@
 msgstr "Error mientras se comunicaba con el servidor"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"El número de modificaciones actuales supera el máximo de modificaciones, el "
+"actual es {0}, el máximo es {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Violación de la capacidades del API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Advertencia:  automáticamente truncando el valor de la etiqueta \"{0}\" en "
+"la primitiva suprimida {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"La longitud del valor para la etiqueta \"{0}\" en la primitiva {1} excede la "
+"máxima longitud permitida {2}. Los valores de longitud son {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Violación de la condición previa"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} nodos en vía {1} supera el máximo número permitido de nodos {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2652,9 +2654,7 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"AVISO: la capa ''{0}'' ya no existe. No se puede eliminar el conflicto para "
-"la primitiva \"{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2680,5 +2680,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "no se puede resolver los conflictos pendientes"
 
@@ -2734,5 +2734,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Dividir segmento de vía"
@@ -2740,6 +2740,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2751,5 +2751,5 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -2857,7 +2857,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3034,5 +3034,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
 
@@ -3051,18 +3051,21 @@
 msgstr "Grados minutos segundos"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3076,41 +3079,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3128,29 +3153,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+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:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
 
@@ -3160,33 +3186,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, 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:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "no se encontró ninguna versión más reciente. El histórico está vacío."
 
@@ -3201,12 +3228,6 @@
 "de datos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, 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/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
@@ -3216,5 +3237,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
@@ -3367,5 +3388,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3376,5 +3397,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3385,5 +3406,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3871,5 +3892,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "capa no listada"
 
@@ -3934,5 +3955,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "el rol {0} no participa en la pareja de comparación {1}"
 
@@ -4036,5 +4057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "pa´rametro actual fuera del rango: obtenido {0}"
 
@@ -4042,15 +4063,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "objeto {0} no encontrado en la lista"
 
@@ -4113,5 +4134,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar mis elementos seleccionados al final de la lista de elementos "
@@ -4121,5 +4142,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copiar mis elementos seleccionados antes del primer elemento seleccionado en "
@@ -4129,5 +4150,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copiar mis elementos seleccionados después del primer elemento seleccionado "
@@ -4135,10 +4156,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copiar su elemento seleccionado al inicio de la lista de elementos fusionados"
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar sus elementos seleccionados al final de la lista de elementos "
@@ -4148,5 +4170,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copiar sus elementos seleccionados antes del primer elemento seleccionado en "
@@ -4167,5 +4189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Subir los elementos seleccionados una posición"
 
@@ -4176,5 +4198,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Bajar las entradas seleccionadas una posición"
 
@@ -4189,5 +4211,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 "Eliminar las entradas seleccionadas de la lista de elementos fusionados"
@@ -4200,5 +4222,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Congelar la lista actual de elementos fusionados"
 
@@ -4208,5 +4230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión"
 
@@ -4214,5 +4236,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
@@ -4222,5 +4245,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4253,15 +4276,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"ajustable {0} no se ha registrado todavía. No se puede establecer la "
-"participación en el ajuste sincronizado"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "ajustable {0} no se ha registrado todavía"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4270,5 +4291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "Los nodos fusionados aún no están congelados. No se puede construir la orden "
@@ -4278,5 +4299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "índice de columna inexperado. Obtenido {0}"
 
@@ -4484,5 +4505,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4544,5 +4565,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4550,5 +4571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
 
@@ -4661,14 +4682,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "parámetro ''{0}'' no debe estar vacío"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4677,91 +4698,94 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "Aún no decidido"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Etiquetas de nodos"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Etiquetas de vías"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Etiquetas de relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Conflictos en la etiquetas pegadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} vía"
+msgstr[1] "{0} vías"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} relación"
+msgstr[1] "{0} relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "Pegar ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "Desde ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "A ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
 msgstr "Aún no decidido"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "Etiquetas de nodos"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "Etiquetas de vías"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "Etiquetas de relaciones"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "Conflictos en la etiquetas pegadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} vía"
-msgstr[1] "{0} vías"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} relación"
-msgstr[1] "{0} relaciones"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr "Pegar ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "Desde ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "A ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
-#, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-msgid "Remove this relation member from the relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-msgid "Undecided"
-msgstr ""
 
 #. --- role editing
@@ -4919,5 +4943,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4975,5 +4999,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "índice fuera de los límites. Obtenido {0}"
 
@@ -5012,5 +5036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Mostrando el historial de la primitiva seleccionada"
 
@@ -5080,5 +5104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<diferente>"
@@ -5307,6 +5331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5358,5 +5381,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5582,4 +5604,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5613,5 +5639,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5883,5 +5914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5889,19 +5920,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5909,9 +5944,4 @@
 msgid "Load history"
 msgstr "Cargar historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -7023,4 +7053,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Descartar y salir"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7034,4 +7068,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "Eliminar capas sin guardar.  Los cambios sin grabar se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Guardar y salir"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7256,6 +7294,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7372,36 +7413,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7409,5 +7450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7416,5 +7457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7449,4 +7490,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7505,5 +7547,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
@@ -7518,5 +7560,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
@@ -7524,5 +7566,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7631,5 +7673,5 @@
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7637,28 +7679,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "pista"
-msgstr[1] "pistas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7666,5 +7692,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7673,5 +7699,5 @@
 msgstr[1] "una traza con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7680,5 +7706,5 @@
 msgstr[1] "{0} formado por las trazas {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7817,5 +7843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Por favor, seleccione la fila a editar"
@@ -7831,5 +7857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8017,4 +8043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8042,5 +8069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid "Draw a circle form HDOP value."
-msgstr ""
+msgstr "Dibujar el valor HDOP de forma circular"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
@@ -8578,5 +8605,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Borrar la fuente seleccionada de la lista."
@@ -8789,33 +8816,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usar preferencia ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "vía sin salida"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8826,15 +8854,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8844,18 +8872,18 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -8885,10 +8913,4 @@
 msgstr "Descargando puntos {0} al {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8902,11 +8924,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "No se pudo leer \"{0}\""
 
@@ -8925,5 +8946,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Descripción de la traza GPS"
 
@@ -8987,5 +9008,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8998,5 +9018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 "Error en el análisis sintáctico: estructura de documento invalida para un "
@@ -9010,5 +9030,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -9060,5 +9080,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -9098,5 +9118,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -9116,5 +9136,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
 
@@ -9122,5 +9142,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -9128,5 +9148,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9139,10 +9159,4 @@
 msgid "Successfully opened changeset {0}"
 msgstr "Conjunto de cambios {0} abierto con éxito"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
@@ -9160,5 +9174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Sin nuevos cambios que enviar"
 
@@ -9178,5 +9192,5 @@
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
+msgstr "Reintentando {0} de {1} en {2} segundos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
@@ -9187,23 +9201,18 @@
 #, java-format
 msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Reintentando {0} de {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9216,5 +9225,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "El servidor responde con un error con código {0}"
 
@@ -9231,7 +9240,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "atributo \"{0}\" obligatorio perdido"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9241,15 +9256,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9257,11 +9272,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9280,5 +9289,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9358,5 +9367,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9364,5 +9373,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9378,15 +9387,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo, "
@@ -9396,5 +9398,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo "
@@ -9403,5 +9406,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
@@ -9411,5 +9414,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), "
@@ -9419,5 +9422,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo booleano, obtenido "
@@ -9427,6 +9430,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "valor ilegal para al atributo obligatorio \"{0}\" de tipo OsmPrimitiveType, "
@@ -9441,32 +9444,37 @@
 msgstr "Error durante el análisis sintáctico."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "El archivo \"{0} no existe"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9478,5 +9486,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9497,5 +9505,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Objeto con id=0 ilegal"
 
@@ -9504,26 +9512,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9531,10 +9528,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9546,5 +9543,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9552,5 +9549,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9558,6 +9555,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9565,5 +9562,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9572,5 +9569,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9589,10 +9586,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9625,5 +9617,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
 
@@ -9638,5 +9630,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9647,5 +9639,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "No se ha podido conectar con el servidor OSM. Por favor, verifique su "
@@ -9653,5 +9645,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9661,5 +9653,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9669,15 +9661,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "Comenzando a subir en un única petición por primitiva..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} restantes. Subiendo nodo ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
@@ -9693,5 +9685,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Comenzando a subir en un única petición..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
@@ -9708,5 +9700,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10124,5 +10116,5 @@
 "de error es: <br> {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10196,5 +10188,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10203,5 +10195,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10210,5 +10202,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10217,5 +10209,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10224,5 +10216,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10365,4 +10357,133 @@
 msgstr "Trazas subidas a openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Direcciones interpoladas"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Impar"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Par"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr "Comenzando #:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10481,4 +10602,9 @@
 msgid "Error while parsing {0}"
 msgstr "Error mientras se analizaba sintácticamente {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "No se pudo leer \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10776,13 +10902,13 @@
 msgstr "Elegir desde..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10791,13 +10917,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11179,28 +11305,28 @@
 msgstr "Capa vacía"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Tamaño de la imagen raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11211,14 +11337,14 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
@@ -11622,9 +11748,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193
 msgid "Running vertex reduction..."
-msgstr "Corriendo reducción de vértices..."
+msgstr "Ejecutando reducción de vértices..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204
 msgid "Running Douglas-Peucker approximation..."
-msgstr "Corriendo aproximación Douglas-Peucker..."
+msgstr "Ejecutando aproximación Douglas-Peucker..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215
@@ -12632,13 +12758,4 @@
 msgstr "Edificios entre medianeras"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Par"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Impar"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12662,41 +12779,4 @@
 msgid "Optional"
 msgstr "Opcional"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Usuario"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Mostrar Panel de Autor"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Abrir página de usuario"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Abrir página de usuario en el navegador"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Seleccionar los datos del usuario"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Remplazar selección con los datos de usuarios"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Por favor, seleccione algunos datos"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Por favor seleccione algún usuario en el panel de autor"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Lo siento, no funciona con usuario anónimos"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12877,10 +12957,10 @@
 msgstr "Sin validación de errores"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Rejilla"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12964,12 +13044,30 @@
 msgstr "otra validación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr "Ejecutando test {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Realiza la validadción de datos"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr "Validando"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr "Test {0}/{1}: Comenzando {2}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13039,21 +13137,21 @@
 msgstr "Remplazar\"{0}\" por \"{1}\" para"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Línea de costa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Este test comprueba si las costas están correctas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Línea de costa desordenada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Cruce de vías."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13061,35 +13159,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Cruce de vías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Esta examen comprueba que no haya nodos en el mismo lugar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Vías duplicadas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13097,5 +13195,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -13113,10 +13211,10 @@
 msgstr "Nodos de vía duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Nodos con el mismo nombre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -13124,9 +13222,9 @@
 "nodos duplicados)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Viales superpuestos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13136,29 +13234,29 @@
 "vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Áreas superpuestas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Vías superpuestas (con área)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Ferrocarriles superpuestos (con área)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Viales superpuestos (con área)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Vías superpuestas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Ferrocarriles superpuestos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Viales superpuestos"
@@ -13175,10 +13273,10 @@
 "Este test comprueba vías que contienen algunos de sus nodos más de una vez."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Vías con nombres iguales"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13187,9 +13285,9 @@
 "escrito mal."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Comprobación de propiedades:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -13197,15 +13295,15 @@
 "valores."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Línea de test de etiquetas no válida - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Línea de correción ortográfica no válida: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13216,7 +13314,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Combinaciones incorrectas de etiquetas y/o valores"
@@ -13224,61 +13322,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problema al dibujar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clave ''{0}'' no válida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Etiquetas con valores vacíos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Clave de propiedad no válida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 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:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Esta clave no está predefinida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 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:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Comprobar las propiedades de las claves"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -13286,21 +13384,21 @@
 "comprobación de las palabras."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Usar analizador de propiedad compleja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Fuente de test de etiquetas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13311,21 +13409,21 @@
 "del corrector de etiquetas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Fuentes de datos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Analizar propiedades de los valores."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -13333,110 +13431,110 @@
 "los predefinidos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Comprobar FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Compruebar el registro de notas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Usar datos de archivo por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 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:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 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:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Utilizar el corrector ortográfico por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Fijar las propiedades"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 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:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 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:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expresión ilegal ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Expresión regular ilegal ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Vías sin cerrar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Esto analiza si las vías circulares están cerradas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "Tipo natural {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "tipo de usos del suelo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "tipo de servicios {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "tipo de deporte {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "tipo de turismo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "tipo de tienda {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "tipo de ocio {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13532,5 +13630,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13546,18 +13644,18 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "área"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Via sin cerrar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Viales sin conectar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13565,78 +13663,78 @@
 "vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 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:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Conectado nodo de extremo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Nodos sin etiquetar y desconectados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 "Este test comprueba nodos sin etiquetar que no pertenecen a ninguna vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Vías sin etiquetar, vacías y de nodo único."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Este test comprueba vías sin etiquetar, vacías y de nodo único."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Vías sin nombre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Cruce sin nombre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Vías sin etiquetar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Vías vacías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Vías de un solo nodo"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Viales ordenados erróneamente."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 "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:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13975,5 +14073,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr ""
+msgstr "Copiar la/s seleccionada/s por defecto"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
@@ -13987,13 +14085,13 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "Overlap tiles"
-msgstr "Teselas superpuestas"
+msgstr "Superposición de teselas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "% of east:"
-msgstr ""
+msgstr "% hacia el Este"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of north:"
-msgstr ""
+msgstr "% hacia el Norte"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -14043,6 +14141,11 @@
 msgstr "Debe hacer públicas sus ediciones para subir nuevos datos"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14053,5 +14156,5 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -14060,5 +14163,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14075,10 +14178,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Crea una cuadrícula de viales"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14086,10 +14189,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permite importar directamente distintos formatos de archivo en JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14100,10 +14203,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicado de vías con cierto desplazamiento unas de otras"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14114,5 +14217,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14121,15 +14224,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualiza la información de enrutamiento como un gráfico de enrutado."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14143,10 +14246,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Ayuda a vectorizar imágenes WMS"
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14156,5 +14259,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14167,10 +14270,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14184,10 +14287,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -14196,5 +14299,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14204,5 +14307,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14212,5 +14315,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14221,15 +14324,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14241,10 +14344,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14255,10 +14358,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -14267,5 +14370,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14279,17 +14382,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Herramientas para trabajar con los autores/usuarios. Selecciona datos del "
-"mapa que pertenecen al usuario seleccionado y abre el navegador con la "
-"página del perfil de autor seleccionada."
 
 #. Plugin utilsplugin
@@ -14385,5 +14478,5 @@
 #: build/trans_presets.java:57
 msgid "Highways"
-msgstr ""
+msgstr "Viales"
 
 #. group "Highways"
@@ -17020,5 +17113,5 @@
 #: build/trans_presets.java:1250
 msgid "Transport"
-msgstr ""
+msgstr "Transporte"
 
 #. group "Transport"
@@ -17838,5 +17931,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Turismo"
 
 #. group "Travel"
@@ -18278,5 +18371,5 @@
 #: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "... otros mods de transporte posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
@@ -19272,4 +19365,24 @@
 msgstr "Estadio"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19622,5 +19735,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr ""
+msgstr "Artificial"
 
 #. group "Man-Made"
@@ -20024,10 +20137,4 @@
 msgid "Country code"
 msgstr "Código del país"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Direcciones interpoladas"
 
 #. item
@@ -21116,5 +21223,5 @@
 #: build/trans_presets.java:2758
 msgid "Geography"
-msgstr ""
+msgstr "Geografía"
 
 #. group "Places"
@@ -26200,10 +26307,10 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "el parámetro '{0}' no debe ser nulo"
-
 #~ 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."
@@ -26256,4 +26363,7 @@
 #~ msgid "unnamed"
 #~ msgstr "sin nombre"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Cambios no guardados"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -26491,4 +26601,22 @@
 #~ msgid "board"
 #~ msgstr "cartel"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Mostrar Panel de Autor"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Abrir página de usuario en el navegador"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Seleccionar los datos del usuario"
+
+#~ msgid "Open User Page"
+#~ msgstr "Abrir página de usuario"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Lo siento, no funciona con usuario anónimos"
 
 #~ msgid ""
@@ -26589,4 +26717,7 @@
 #~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo "
 #~ "al servidor."
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Remplazar selección con los datos de usuarios"
 
 #~ msgid "rectifier id={0}"
@@ -26662,4 +26793,10 @@
 #~ msgstr "Deportes"
 
+#~ msgid "Please select some data"
+#~ msgstr "Por favor, seleccione algunos datos"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Por favor seleccione algún usuario en el panel de autor"
+
 #~ msgid "Invalid projection"
 #~ msgstr "Proyección inválida"
@@ -26698,4 +26835,12 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Eliminar nodos de ruta"
+
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Herramientas para trabajar con los autores/usuarios. Selecciona datos del "
+#~ "mapa que pertenecen al usuario seleccionado y abre el navegador con la "
+#~ "página del perfil de autor seleccionada."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26711,14 +26856,4 @@
 #~ "antes subirlas a OSM para, por ejemplo, suprimir partes de la traza poco "
 #~ "interesantes."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">spanish</A>."
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -26850,4 +26985,7 @@
 #~ msgstr "Fallo en la inicialización del API"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "el parámetro '{0}' no debe ser nulo"
+
 #~ msgid "Data Layer"
 #~ msgstr "Capa de datos"
@@ -26876,7 +27014,4 @@
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Eliminando miembro de relación {0} {1}"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- la versión en ejecución es la {0}"
 
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
@@ -26917,2 +27052,23 @@
 #~ msgstr ""
 #~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios "
+#~ "y continuar?"
+#~ msgstr[1] ""
+#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los "
+#~ "cambios y continuar?"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A> or <A "
+#~ "HREF=\"{1}\">spanish</A>."
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/et.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 19:57+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:51+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Viga"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Salvestamata muudatused"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Salvesta ja välju"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Tühista ja välju"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Loobu"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoreerin vigast URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Hoiatus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -393,4 +327,52 @@
 msgid "Merge"
 msgstr "Ühenda"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Loobu"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -484,4 +466,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -496,5 +479,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -531,6 +514,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -552,39 +535,4 @@
 msgid "Please select at least three nodes."
 msgstr "Palun vali vähemalt kolm sõlme."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "API võimaluste rikkumine"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Eeltingimuste rikkumine"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -653,5 +601,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -764,5 +712,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -778,5 +726,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -826,8 +774,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -998,5 +948,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameeter ''{0}'' ei tohi olla null"
 
@@ -1004,5 +954,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1034,5 +984,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Muuda"
@@ -1723,14 +1673,14 @@
 msgstr "Tühi valik"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Lae OSMi serverisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Lae kõik muudatused OSM serverisse üles."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1739,23 +1689,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sünkroniseeri ainult {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Sünkroniseeri kogu andmekogu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1769,17 +1719,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Avastatud konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1790,39 +1740,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Laadimine OSM API-le ebaõnnestus"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Primitiivi uuendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1934,8 +1885,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Andmeid ei imporditud."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2454,4 +2401,63 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API võimaluste rikkumine"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Eeltingimuste rikkumine"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2553,6 +2559,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2577,5 +2583,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2631,5 +2637,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2637,6 +2643,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2645,5 +2651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2917,5 +2923,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2934,18 +2940,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr ""
@@ -2959,41 +2968,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3011,29 +3042,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3043,33 +3075,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3082,12 +3115,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3095,5 +3122,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3243,5 +3270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3252,5 +3279,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3261,5 +3288,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3740,5 +3767,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
@@ -3801,5 +3828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3899,5 +3926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3905,15 +3932,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3969,5 +3996,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3975,5 +4002,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3981,13 +4008,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3995,5 +4023,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4010,5 +4038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4019,5 +4047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4032,5 +4060,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4042,5 +4070,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4050,5 +4078,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4056,5 +4084,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4062,5 +4091,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4091,6 +4120,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4098,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4106,5 +4135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4112,5 +4141,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4305,5 +4334,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4364,5 +4393,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4370,5 +4399,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4478,14 +4507,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4494,7 +4523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4559,5 +4586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4580,4 +4607,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4734,5 +4766,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4790,5 +4822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4826,5 +4858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4894,5 +4926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<erinev>"
@@ -5119,6 +5151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5170,5 +5201,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5394,4 +5424,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5425,5 +5459,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5691,5 +5730,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5697,28 +5736,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6831,4 +6869,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Tühista ja välju"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6842,4 +6884,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Salvesta ja välju"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7062,6 +7108,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7177,36 +7226,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7214,5 +7263,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7221,5 +7270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7254,4 +7303,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7310,5 +7360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
@@ -7323,5 +7373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7329,5 +7379,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7429,5 +7479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7435,22 +7485,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
@@ -7458,5 +7492,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7464,5 +7498,5 @@
 msgstr[1] "punktid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7471,5 +7505,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7478,5 +7512,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7606,5 +7640,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "PAlun vali rida muutmiseks"
@@ -7620,5 +7654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7786,4 +7820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8325,5 +8360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -8510,33 +8545,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Kasuta eelseadet \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "suletud tee"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8547,15 +8583,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8565,18 +8601,18 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Muuda seadeid"
@@ -8606,10 +8642,4 @@
 msgstr "Laen alla punkte alates {0} kuni {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8623,11 +8653,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Ei suutnud lugeda \"{0}\""
 
@@ -8644,5 +8673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "GPS jälje kirjeldus"
 
@@ -8706,5 +8735,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8717,5 +8745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: vigane gpx dokumendi struktuur"
 
@@ -8727,5 +8755,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8777,5 +8805,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8815,5 +8843,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8831,5 +8859,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8837,5 +8865,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8843,5 +8871,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8853,10 +8881,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8875,5 +8897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8905,20 +8927,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8931,5 +8948,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8946,6 +8963,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8956,15 +8979,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8972,11 +8995,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -8995,5 +9012,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9071,5 +9088,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9077,5 +9094,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9091,15 +9108,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9107,10 +9117,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9118,5 +9129,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9124,5 +9135,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9130,6 +9141,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9142,32 +9153,37 @@
 msgstr "Viga sõelumisel."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9179,5 +9195,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9198,5 +9214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Keelatud objekti number id=0"
 
@@ -9205,26 +9221,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9232,10 +9237,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9247,5 +9252,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9253,5 +9258,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9259,6 +9264,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9266,5 +9271,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9273,5 +9278,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9290,10 +9295,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9326,5 +9326,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9339,5 +9339,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9348,9 +9348,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9360,5 +9360,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9368,5 +9368,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9407,5 +9407,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9796,5 +9796,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9866,5 +9866,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9873,5 +9873,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9880,5 +9880,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9887,5 +9887,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9894,5 +9894,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10032,4 +10032,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10144,4 +10273,9 @@
 msgid "Error while parsing {0}"
 msgstr "Viga {0} parsimisel"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Ei suutnud lugeda \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10424,13 +10558,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10439,13 +10573,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10798,28 +10932,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10828,14 +10962,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12206,13 +12340,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12235,41 +12360,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12443,10 +12531,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12524,11 +12612,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
 msgstr ""
 
@@ -12599,21 +12705,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12621,35 +12727,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12657,5 +12763,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12673,18 +12779,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12692,29 +12798,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Kattuvad alad"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12730,33 +12836,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12765,7 +12871,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12773,80 +12879,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12854,130 +12960,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13073,5 +13179,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13087,91 +13193,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13557,6 +13663,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13565,10 +13676,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13580,10 +13691,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13591,10 +13702,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13603,10 +13714,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13615,20 +13726,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13638,10 +13749,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13649,5 +13760,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13657,10 +13768,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13670,15 +13781,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13686,5 +13797,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13692,5 +13803,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13699,15 +13810,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13716,10 +13827,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13728,15 +13839,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13746,13 +13857,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18725,4 +18829,24 @@
 msgstr ""
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19477,10 +19601,4 @@
 msgid "Country code"
 msgstr "Riigi kood"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr ""
 
 #. item
@@ -25661,4 +25779,7 @@
 #~ msgstr "E-post"
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Salvestamata muudatused"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
@@ -25761,4 +25882,98 @@
 #~ msgstr "Kõik teed olid tühjad."
 
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
+#~ "laetud elementidel on ajalugu."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Liida igal juhul."
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Liida erineva kuuluvusega sõlmed?"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
+
+#~ msgid "unnamed"
+#~ msgstr "Nimetu"
+
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed."
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME parandatud)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
+#~ "teata sellest veast arendajaid."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Leidub <member> element, mis ei ole seotud"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed "
+#~ "laaditud?"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
+
+#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
+
+#~ msgid "No data imported."
+#~ msgstr "Andmeid ei imporditud."
+
+#~ msgid "Change"
+#~ msgstr "Muuda"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Kustuta {1} {0}"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
+
+#~ msgid "API initialization failed"
+#~ msgstr "API initsialiseerimine ebaõnnestus"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Puuduv primitiiv"
+
+#~ msgid "No data"
+#~ msgstr "Andmeid pole"
+
+#~ msgid "Update failed"
+#~ msgstr "Uuendamine ebaõnnestus"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd> element võib olla vaid way-s."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">English</A>."
@@ -25770,93 +25985,2 @@
 #~ "Abileht puudub. Loo see <A HREF=\"{0}\">English</A> või <A HREF=\"{1}"
 #~ "\">eesti</A>"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
-#~ "laetud elementidel on ajalugu."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Liida igal juhul."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Liida erineva kuuluvusega sõlmed?"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
-
-#~ msgid "unnamed"
-#~ msgstr "Nimetu"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed."
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME parandatud)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
-#~ "teata sellest veast arendajaid."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Leidub <member> element, mis ei ole seotud"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed "
-#~ "laaditud?"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
-
-#~ msgid "Change"
-#~ msgstr "Muuda"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Kustuta {1} {0}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
-
-#~ msgid "API initialization failed"
-#~ msgstr "API initsialiseerimine ebaõnnestus"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Puuduv primitiiv"
-
-#~ msgid "No data"
-#~ msgstr "Andmeid pole"
-
-#~ msgid "Update failed"
-#~ msgstr "Uuendamine ebaõnnestus"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd> element võib olla vaid way-s."
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-15 05:24+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:33+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Virhe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Tallentamattomia muutoksia"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Tallenna ja poistu"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Poistu tallentamatta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,17 +180,17 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Ei voitu lukea tiedostoa ''{0}''.<br> Virhe: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -371,5 +305,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
 msgid "Please select at least one already uploaded node, way, or relation."
-msgstr ""
+msgstr "Valitse ainakin yksi jo lähetetty piste, polku tai relaatio."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
@@ -393,4 +327,52 @@
 msgid "Merge"
 msgstr "Yhdistä"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Peruuta"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -484,4 +466,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -496,5 +479,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -531,6 +514,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,41 +536,4 @@
 msgstr "Valitse ainakin kolme pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on {0}, "
-"enimmäismäärä on {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -640,10 +586,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Sulje avoimet muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Sulkee avoimet muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -655,5 +601,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -663,15 +609,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Ei avonaisia muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Ei avonaisia muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Ladataan avonaiset muutoskokoelmat..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -768,5 +714,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -782,5 +728,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -830,8 +776,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -847,13 +795,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Lataa viittaavat objektit OSM-palvelimelta..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
+msgstr "Lataa kaikki valittuihin objekteihin viittaavat objektit."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 msgid "Download referrers..."
-msgstr ""
+msgstr "Lataa viittaavat objektit..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
@@ -1002,5 +950,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parametri ''{0}'' ei saa olla tyhjä"
 
@@ -1008,5 +956,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1038,5 +986,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Muokkaa"
@@ -1691,5 +1639,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Update Data"
-msgstr ""
+msgstr "Päivitä data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
@@ -1729,14 +1677,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Lähetä OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1745,23 +1693,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1775,17 +1723,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1796,39 +1744,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "Muutoskokoelma suljettu"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1940,8 +1889,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Dataa ei tuotu."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2126,5 +2071,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 msgid "Select, move and rotate objects"
-msgstr "Valitse, siirrä ja pyöritä objekteja"
+msgstr "Valitse, siirrä ja kierrä objekteja"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
@@ -2468,4 +2413,65 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on {0}, "
+"enimmäismäärä on {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "Polussa {1} on {0} pistettä joka on enemmän kuin maksimi ({2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2501,30 +2507,30 @@
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "Poista \"{0}\" pisteestä \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "Poista \"{0}\" polusta \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
+msgstr "Poista \"{0}\" relaatiosta \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "Aseta {0}={1} pisteelle \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "Aseta {0}={1} polulle \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "Aseta {0}={1} relaatiolle \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2567,6 +2573,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2591,5 +2597,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2598,6 +2604,6 @@
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poista {0} objekti"
+msgstr[1] "Poista {0} objektia"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
@@ -2605,6 +2611,6 @@
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poista {0} piste"
+msgstr[1] "Poista {0} pistettä"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
@@ -2612,6 +2618,6 @@
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poista {0} polku"
+msgstr[1] "Poista {0} polkua"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
@@ -2619,6 +2625,6 @@
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poista {0} relaatio"
+msgstr[1] "Poista {0} relaatiota"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
@@ -2645,5 +2651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Katkaise polku"
@@ -2651,6 +2657,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2662,5 +2668,5 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2675,6 +2681,6 @@
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Siirrä {0} piste"
+msgstr[1] "Siirrä {0} pistettä"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2723,6 +2729,6 @@
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kierrä {0} pistettä"
+msgstr[1] "Kierrä {0} pistettä"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2936,5 +2942,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2953,18 +2959,21 @@
 msgstr "Asteina, minuutteina ja sekunteina"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "P"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "L"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "I"
@@ -2975,44 +2984,66 @@
 #, java-format
 msgid "Changeset {0}"
-msgstr ""
+msgstr "Muutoskokoelma {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3030,29 +3061,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3062,33 +3094,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3101,12 +3134,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3114,5 +3141,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3263,5 +3290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3272,5 +3299,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3281,5 +3308,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3754,5 +3781,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
@@ -3815,5 +3842,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3913,5 +3940,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3919,15 +3946,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3983,5 +4010,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3989,5 +4016,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3995,13 +4022,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4009,5 +4037,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4024,5 +4052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4033,5 +4061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4046,5 +4074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4056,5 +4084,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4064,5 +4092,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4070,5 +4098,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4076,5 +4105,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4105,6 +4134,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4112,5 +4141,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4120,5 +4149,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4126,5 +4155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4319,5 +4348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4378,5 +4407,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4384,5 +4413,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4492,14 +4521,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4508,7 +4537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4573,5 +4600,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4594,4 +4621,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4748,5 +4780,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4804,5 +4836,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4840,5 +4872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4908,5 +4940,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<eri>"
@@ -5134,6 +5166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5185,5 +5216,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5409,4 +5439,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5440,5 +5474,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5708,5 +5747,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5714,28 +5753,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6646,17 +6684,19 @@
 "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
 msgstr ""
+"<html><strong>{2}</strong> loi version <strong>{0}</strong> <strong>{1}</"
+"strong> muutoskokoelmassa <strong>{3}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
 msgid "Changeset info"
-msgstr ""
+msgstr "Muutoskokoelma"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Avaa muutoskokoelman tiedot selaimessa"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Näytä muutoskokoelma {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6671,5 +6711,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "Muutoskokoleman id:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
@@ -6679,39 +6719,39 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Muutoskokoelman kommentti:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
 msgid "No open changeset"
-msgstr ""
+msgstr "Ei avonaista muutoskokoelmaa"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Ole hyvä ja valitse muutoskokoelmat jotka haluat sulkea</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "Avonaiset muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "Sulje muutoskokoelmat"
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Suljet valitut avonaiset muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Peruuta muutoskokoelmien sulkeminen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
 msgid "Closing changeset"
-msgstr ""
+msgstr "Suljetaan muutoskokoelma"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Suljetaan muutoskokoelma {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6848,4 +6888,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Poistu tallentamatta"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6859,4 +6903,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Tallenna ja poistu"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -6967,5 +7015,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
-msgstr ""
+msgstr "Uuden muutoskokoelman tagit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
@@ -7012,5 +7060,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
+msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
@@ -7038,25 +7086,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Avaa uusi muutoskokoelma"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
+"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Käytä avonaista muutoskokoelmaa"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Lähetä data avonaiseen muutoskokoelmaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Sulje muutoskokoelma lähetyksen jälkeen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
 msgstr ""
+"Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7065,18 +7115,21 @@
 #, java-format
 msgid "Tags of changeset {0}"
-msgstr ""
+msgstr "Muutoskokoelman {0} tagit"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Sulje valittuna oleva avoin muutoskokoelma"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7192,36 +7245,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-piste"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7229,5 +7282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7236,5 +7289,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7269,4 +7322,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7283,6 +7337,6 @@
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} jälki"
+msgstr[1] "{0} jälkeä"
 
 #. item "Relations/Route" text "Symbol description"
@@ -7325,5 +7379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
@@ -7338,5 +7392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7344,5 +7398,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7444,5 +7498,5 @@
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7450,28 +7504,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "jälki"
-msgstr[1] "jäljet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7479,5 +7517,5 @@
 msgstr[1] "pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7486,5 +7524,5 @@
 msgstr[1] "jälki, jossa on {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7493,5 +7531,5 @@
 msgstr[1] "{0}:ssä on {1} jälkeä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7619,5 +7657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Ole hyvä ja valitse muokattava rivi."
@@ -7633,5 +7671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7801,4 +7839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -7813,5 +7852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
@@ -8016,4 +8055,6 @@
 "Layer Manager."
 msgstr ""
+"Kaikki pisteet ja jäljen segmentit ovat samanvärisiä. Värin voi vaihtaa "
+"tason ominaisuuksista."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
@@ -8031,5 +8072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
+msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
@@ -8348,5 +8389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Poista valittu lähde listasta."
@@ -8545,33 +8586,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Käytä esivalintaa ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8582,15 +8624,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8600,18 +8642,18 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+msgstr "Valinta ei ole sopiva!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Muuta ominaisuuksia"
@@ -8641,10 +8683,4 @@
 msgstr "Ladataan pisteet {0}-{1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8658,11 +8694,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Ei voitu lukea \"{0}\":aa"
 
@@ -8681,5 +8716,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "gps-jäljen kuvaus"
 
@@ -8743,5 +8778,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8754,5 +8788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
 
@@ -8764,5 +8798,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8814,5 +8848,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8852,5 +8886,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8868,5 +8902,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8874,5 +8908,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8880,30 +8914,24 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
-msgstr ""
+msgstr "Luodaan muutoskokoelma..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
+msgstr "Onnistuneesti avattiin muutoskokoelma {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
+msgstr "Päivitetään muutoskokoelma..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
+msgstr "Päivitetään muutoskokoelmaa {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
@@ -8912,5 +8940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8942,20 +8970,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8968,5 +8991,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8983,6 +9006,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8993,15 +9022,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9009,11 +9038,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9032,10 +9055,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "Käsitellään muutoskokoelmalistaa..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
@@ -9108,5 +9131,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9114,5 +9137,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9128,15 +9151,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9144,10 +9160,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9155,5 +9172,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9161,5 +9178,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9167,6 +9184,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9179,32 +9196,37 @@
 msgstr "Virhe jäsennettäessä."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9216,5 +9238,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9235,5 +9257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Virheellinen objekti (id=0)"
 
@@ -9242,26 +9264,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9269,10 +9280,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9284,5 +9295,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9290,5 +9301,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9296,6 +9307,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9303,5 +9314,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9310,5 +9321,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9327,10 +9338,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9345,23 +9351,23 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Luetaan muutoskokoelmia..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Ladataan muutoskokoelmia..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Luetaan muutoskokoelmaa {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Ladataan muutoskokoelmaa {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9376,5 +9382,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9385,9 +9391,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9397,5 +9403,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9405,5 +9411,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9444,5 +9450,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9774,4 +9780,7 @@
 "changeset will automatically be closed by the server after a timeout.</html>"
 msgstr ""
+"<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "
+"''{1}''.<br>Palvelin sulkee muutoskokoelman automaattisesti aikarajan "
+"umpeuduttua</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
@@ -9845,5 +9854,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9915,5 +9924,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9922,5 +9931,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9929,5 +9938,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9936,5 +9945,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9943,5 +9952,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10028,5 +10037,5 @@
 #, java-format
 msgid "Selected track: {0}"
-msgstr ""
+msgstr "Valittu jälki: {0}"
 
 #. Set progress dialog to indeterminate while connecting
@@ -10081,4 +10090,133 @@
 msgstr "Lähettää jäljet openstreetmap.org:iin"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Talonumeroiden interpolointilinja"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10198,4 +10336,9 @@
 msgstr "Virhe tulkittaessa {0}:aa"
 
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Ei voitu lukea \"{0}\":aa"
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
 msgid ""
@@ -10290,5 +10433,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
-msgstr ""
+msgstr "Kohdista kuvia GPX-jälkeen"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -10302,9 +10445,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:591
 msgid "You should select a GPX track"
-msgstr ""
+msgstr "Valitse GPX-jälki"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
 msgid "No selected GPX track"
-msgstr ""
+msgstr "GPX-jälkeä ei valittuna"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604
@@ -10337,5 +10480,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662
 msgid "GPX Track loaded"
-msgstr ""
+msgstr "GPX-jälki ladattu"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:697
@@ -10351,4 +10494,5 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
+"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
@@ -10481,13 +10625,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10496,13 +10640,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10855,28 +10999,28 @@
 msgstr "Tyhjä taso"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10885,14 +11029,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12281,13 +12425,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12310,41 +12445,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12521,10 +12619,10 @@
 msgstr "Ei virheitä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Ruudukko"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12606,12 +12704,30 @@
 msgstr "muut tarkistukset"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Tarkistus"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Suorittaa datantarkistuksen"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12683,21 +12799,21 @@
 msgstr "Korvaa \"{0}\" → \"{1}\" kohteelle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Rantaviivat."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Tämä tarkistaa, että rantaviivat ovat oikein."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Risteävät polut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12705,35 +12821,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Risteävät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12741,5 +12857,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12757,10 +12873,10 @@
 msgstr "Polkujen pisteiden kaksoiskappaleet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Samannimiset solmut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -12768,9 +12884,9 @@
 "kaksoiskappaleita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Päällekkäiset polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12778,29 +12894,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Päällekkäiset alueet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Tiet alueiden kanssa päällekkäin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Radat alueiden kanssa päällekkäin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Polut alueiden kanssa päällekkäin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Päällekkäiset tiet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Päällekkäiset radat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Päällekkäiset polut"
@@ -12818,10 +12934,10 @@
 "kerran."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Nimeämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -12829,23 +12945,23 @@
 "Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Ominaisuustarkistin:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Etsii virheellisiä avain/arvo-pareja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Epäkelpo oikeinkirjoituksen tarkistussääntö: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12856,7 +12972,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Virheelliset avain/arvo-parit"
@@ -12864,81 +12980,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Piirto-ongelma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Avain \"{0}\" virheellinen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Tyhjät arvot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Epäkelpo avain"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Virheellinen välilyönti avaimessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Tarkista ominaisuuksien avaimet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12949,133 +13065,133 @@
 "php/User:JLS/speller )"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "Lisää tiedosto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Tarkista ominaisuuksien arvot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Etsi FIXME:t"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Käytä oletussääntötiedostoa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Virheellinen säännöllinen lauseke \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Sulkemattomat polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 "Etsii polkuja, joiden pitäisi tagiensa perusteella olla suljettuja alueita."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "tyyppiä natural {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "tyyppiä maankäyttö {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13171,5 +13287,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13185,43 +13301,43 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "alue"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Yhdistämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Etsii polut joiden päätesolmu on hyvin lähellä jotain muuta polkua."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Polun solmu lähellä toista polkua"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Tagittomia irrallisia solmuja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13229,37 +13345,37 @@
 "polkua."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Tagittomat, tyhjät ja yhden pisteen polut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Tämä tarkistaa tagittomat, tyhjät ja yhden pisteen polut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Nimeämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Tagittomat polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Tyhjät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Yhden pisteen polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Väärään suuntaan kierretyt polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
@@ -13267,13 +13383,13 @@
 "oikealla)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Maa-alue väärin päin: maan pitää olla polun vasemmalla puolella."
@@ -13663,6 +13779,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13671,10 +13792,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13686,10 +13807,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13697,10 +13818,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13709,10 +13830,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13721,20 +13842,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13744,10 +13865,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13755,5 +13876,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13763,10 +13884,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13776,15 +13897,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13792,5 +13913,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13798,5 +13919,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13805,15 +13926,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13822,10 +13943,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13834,15 +13955,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13852,13 +13973,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18831,4 +18945,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19583,10 +19717,4 @@
 msgid "Country code"
 msgstr "Maakoodi"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Talonumeroiden interpolointilinja"
 
 #. item
@@ -25758,4 +25886,7 @@
 #~ msgstr "Keskeytetään..."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Lisää valitut objektit jäseniksi"
@@ -25911,4 +26042,7 @@
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
+
+#~ msgid "No data imported."
+#~ msgstr "Dataa ei tuotu."
 
 #~ msgid "Really mark this issue as ''done''?"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 17764)
@@ -6,16 +6,17 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:29+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:32+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
-"Language-Team: Fr\n"
+"Language-Team: Fr <>\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-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+"X-Poedit-Language: French\n"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -23,5 +24,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -30,14 +31,14 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "La projection {0} ne peut être activée. Utilisation de Mercator"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+msgstr "La projection {0} ne peut être activée. Utilisation de Mercator."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -74,6 +75,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -88,4 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -101,6 +107,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -108,86 +114,11 @@
 msgstr "Erreur"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
-"modifications et continuer ?"
-msgstr[1] ""
-"Il y a des modifications non sauvegardées dans {0} calques. Ignorer les "
-"modifications et continuer ?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Modifications non enregistrées"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Enregistrer et quitter"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Annuler et quitter"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorant l’URL malformé : \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+msgstr "Ignorant l’URL mal-formée : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -209,7 +140,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -223,5 +154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -248,13 +179,13 @@
 msgstr "Avertissement"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorant l URL malformé du fichier : \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+msgstr "Ignorant l URL malformée du fichier : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -276,5 +207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "Display the about screen."
-msgstr "Afficher l’à propos."
+msgstr "Afficher l’À propos."
 
 #. TODO: put in a platformHook for system that have no console by default
@@ -289,5 +220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
-msgstr "Editeur Java OpenStreetMap"
+msgstr "Éditeur Java OpenStreetMap"
 
 #. Add the version number
@@ -373,4 +304,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Attention : format de base du l'URL de l'API inattendu. Les redirections "
+"vers les pages utilisateurs OSM échouera probablement. L'URL de base de "
+"L'API est : ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -385,5 +319,5 @@
 "primitives only"
 msgstr ""
-"ATTENTION : ouverture des’ fenêtres du navigateur pour les {0} sur {1} "
+"ATTENTION : ouverture des fenêtres du navigateur pour les {0} sur {1} "
 "primitives sélectionnées uniquement."
 
@@ -401,4 +335,52 @@
 msgid "Merge"
 msgstr "Fusionner"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Annuler"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -494,4 +476,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -506,5 +489,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -541,6 +524,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -563,47 +546,4 @@
 msgstr "Veuillez sélectionner au moins trois nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
-"courant : {0}, maximum : {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Violation des capacités de l’API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
-"primitive supprimée {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
-"longueur maximale autorisée {2}. la longueur actuelle est de {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Violation de la condition prédéfinie"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés "
-"{2}"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -656,10 +596,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Ferme les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -671,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -679,15 +619,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Il n'y a pas d'ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Pas d'ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Téléchargement des ensembles de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -788,5 +728,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -802,5 +742,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -850,8 +790,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1024,5 +966,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "le paramètre \"{0}\" ne doit pas être vide"
 
@@ -1030,5 +972,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
 
@@ -1060,5 +1002,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Édition"
@@ -1769,14 +1711,14 @@
 msgstr "La sélection est vide"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Envoyer tous les changements sur le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1787,23 +1729,23 @@
 "les résoudre d'abord.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Rien à envoyer. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchroniser {0} {1} seulement"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchroniser tout le jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1825,17 +1767,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Conflit détecté"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "valeur inattendue retournée. Reçue {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1851,16 +1793,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "Ensemble de changement fermé"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1868,23 +1811,23 @@
 "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "L’envoi vers l’API OSM a échoué"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Mise à jour des primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1998,8 +1941,4 @@
 "Ignore l'exception car le téléchargement a été annulé. L'exception était : "
 "{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Aucune donnée importée"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2283,5 +2222,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Veuillez entrer une chaine de caractère comme filtre."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2303,5 +2242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "trouver dans une selection"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2564,4 +2503,71 @@
 msgid "Error while communicating with server."
 msgstr "Erreur de communication avec le serveur"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
+"courant : {0}, maximum : {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Violation des capacités de l’API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
+"primitive supprimée {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
+"longueur maximale autorisée {2}. la longueur actuelle est de {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Violation de la condition prédéfinie"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} nœuds dans le chemin {1} excèdent le nombre maximum de nœuds autorisés "
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2664,9 +2670,7 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Attention : La couche ''{0}'' n'existe plus. Impossible de supprimer le "
-"conflit pour l'élément ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2692,5 +2696,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "impossible de résoudre un conflit non arbitré"
 
@@ -2750,5 +2754,5 @@
 "de la relation ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Séparer le segment du chemin"
@@ -2756,6 +2760,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2767,5 +2771,5 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Confirmation de suppression"
@@ -2873,7 +2877,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3050,5 +3054,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
 
@@ -3067,18 +3071,21 @@
 msgstr "Degrés Minutes Secondes"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3092,43 +3099,65 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "paramètre {0} > 0 requis. Reçu {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "H"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "Texte"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "C"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgstr "R"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgstr "A"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgstr "D"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
+msgstr "F"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3144,29 +3173,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
@@ -3176,20 +3206,21 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
-msgstr "Impossible d'ajouter le nœud {0} au chemin incomplet {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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"
@@ -3197,13 +3228,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "pas de version plus récente trouvée. L’historique est vide."
 
@@ -3217,12 +3248,6 @@
 "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/RelationMember.java:34
-#, 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/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
 
@@ -3230,5 +3255,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
@@ -3384,5 +3409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3393,5 +3418,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3402,5 +3427,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3890,9 +3915,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
 msgid "User:"
-msgstr ""
+msgstr "Utilisateur :"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
@@ -3958,5 +3983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}"
 
@@ -4060,5 +4085,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "paramètre en dehors de la plage : reçu {0}"
 
@@ -4066,15 +4091,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "élément {0} non trouvé dans la liste"
 
@@ -4132,5 +4157,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés"
@@ -4139,5 +4164,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés avant le premier élément sélectionné de la "
@@ -4147,5 +4172,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copier mes éléments sélectionnés après le premier élément sélectionné de la "
@@ -4153,5 +4178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés au début de la liste des éléments "
@@ -4159,5 +4185,5 @@
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés à la fin de la liste des éléments "
@@ -4167,5 +4193,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copier leurs éléments sélectionnés avant le premier élément sélectionné de "
@@ -4186,5 +4212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Remonter les éléments sélectionnés d'un cran"
 
@@ -4195,5 +4221,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Descendre les éléments sélectionnés d'un cran"
 
@@ -4208,5 +4234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
 
@@ -4218,5 +4244,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Fige la liste courante des éléments fusionnés"
 
@@ -4226,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Libérer la liste courante des éléments fusionnés"
 
@@ -4232,5 +4258,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Cliquer <strong>{0}</strong> pour commencer la fusion de leurs "
@@ -4240,5 +4267,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4271,13 +4298,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr "variable {0} non encore enregistrée."
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "variable {0} non encore enregistrée"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4286,5 +4313,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
@@ -4294,5 +4321,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "index de colonne inattendu. Reçu {0}"
 
@@ -4498,5 +4525,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
@@ -4560,5 +4587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 "impossible de fusionner un élément dont le conflit d’étiquette n’a pas été "
@@ -4568,5 +4595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
 
@@ -4627,5 +4654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Annuler la résolution des conflits"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
@@ -4676,14 +4703,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "La suite d’attributs ne comprend pas la valeur sélectionnée « {0} »"
 
@@ -4692,91 +4719,94 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "Pas encore décidé."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Attributs issus de nœuds"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Attributs issus de chemins"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Attributs issus de relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Conflits entre des attributs collés"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} voie"
+msgstr[1] "{0} voies"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} relation"
+msgstr[1] "{0} relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "Coller…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "De…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "Pour…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} attribut"
+msgstr[1] "{0} attributs"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr "Supprimer ce membre de la relation de la relation."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr "Remplacer"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr "Non décidé"
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
 msgstr "Pas encore décidé."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "Attributs issus de nœuds"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "Attributs issus de chemins"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "Attributs issus de relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "Conflits entre des attributs collés"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} voie"
-msgstr[1] "{0} voies"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} relation"
-msgstr[1] "{0} relations"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "De…"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "Pour…"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
-#, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-msgid "Remove this relation member from the relation"
-msgstr "Supprimer ce membre de la relation de la relation."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-msgid "Undecided"
-msgstr "Non décidé"
 
 #. --- role editing
@@ -4935,5 +4965,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4942,29 +4972,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Ajouter un filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Éditer le filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Supprimer le filtre."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Déplacer le filtre vers le haut."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Déplacer le filtre vers le bas."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Activer le filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Cacher les éléments"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
@@ -4974,9 +5004,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Inverse filter"
-msgstr ""
+msgstr "Inverser le filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Mode filtre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -4991,5 +5021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "index en dehors des limites. Reçu {0}"
 
@@ -5005,5 +5035,5 @@
 #, java-format
 msgid "Way {0}"
-msgstr ""
+msgstr "Chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
@@ -5027,5 +5057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Afficher l'historique de la primitive sélectionnée"
 
@@ -5077,5 +5107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
 msgid "Information about layer"
-msgstr ""
+msgstr "Informations à propos du calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
@@ -5095,5 +5125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<différent>"
@@ -5314,5 +5344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Encodage manquant"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5325,6 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "éditer la relation en référence du membre de relation sélectionné"
 
@@ -5378,5 +5407,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5611,4 +5639,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation 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:192
 msgid "Zoom to"
@@ -5642,6 +5674,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5914,5 +5952,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "historique pas encore initialisé. Impossible de définir la référence de la "
@@ -5922,12 +5960,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr ""
-"impossible de définir la référence. la référence d’id {0} ne correspond pas "
-"à l'historique d’id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "échec de la définition de la référence. la référence de version {0} n’est "
@@ -5935,5 +5973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 "historique non encore initialisé. Impossible de définir la primitive "
@@ -5942,5 +5980,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 "impossible de définir l’en-cours. la version actuelle {0} n’est pas "
@@ -5950,9 +5990,4 @@
 msgid "Load history"
 msgstr "Chargement de l'historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6865,9 +6900,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
 msgid "Changeset info"
-msgstr ""
+msgstr "Informations sur l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
 msgstr ""
+"Lancer un navigateur avec les informations sur l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
@@ -6887,13 +6923,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "Identifiant de l'ensemble de changements :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Créé le :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Commentaire sur l'ensemble de changement :"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -6904,21 +6940,23 @@
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr ""
+"<html>Veuillez sélectionner l'ensemble de changement que vous voulez fermer</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "Ouvrir les ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements"
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Fermer les ensembles de changements sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Annuler la fermeture des ensembles de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
@@ -6969,9 +7007,9 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Layer ''{0}'' has no modifications to be saved."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Pas de fichier associé à ce calque"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
@@ -6988,4 +7026,6 @@
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
+"Le fichier ''{0}'' n'est pas inscriptible. Veuillez spécifier un autre nom "
+"de fichier."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
@@ -6993,5 +7033,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Envoyer le calque ''{0}'' sur le serveur ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -7032,5 +7072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Il y a des données et des conflits non sauvegardés."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
@@ -7071,4 +7111,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Annuler et quitter"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7078,9 +7122,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Abandonner et supprimer"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Enregistrer et quitter"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7109,4 +7157,6 @@
 "cancelled or has been failed.</html>"
 msgstr ""
+"<html>Une opération d'envoi et/ou de sauvegarde d'un calque avec des "
+"modifications<br>a été annulé ou a échoué.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
@@ -7170,13 +7220,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Envoyer ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Sauvegarder ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
 msgid "Filename"
-msgstr ""
+msgstr "Nom de fichier"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
@@ -7240,4 +7290,6 @@
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
+"Veuillez entrer un commentaire sur cet ensemble de changements (minimum 3 "
+"caractères)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
@@ -7267,25 +7319,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Ouvrir un nouvel ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
+"Ouvrir un nouvel ensemble de changements et l'utiliser pour le prochain envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Utiliser ensemble de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Envoyer les données vers un ensemble de changements déjà ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Fermer l'ensemble de changements après l'envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Fermer l'ensemble de changements après le prochain envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7299,13 +7352,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Charger la liste de vos ensembles de changements depuis le serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Fermer l'ensemble de changements actuellement ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7421,36 +7477,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "point GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7458,5 +7514,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7465,5 +7521,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7498,4 +7554,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7528,5 +7585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Length"
-msgstr ""
+msgstr "Longueur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
@@ -7554,5 +7611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
@@ -7568,5 +7625,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7574,5 +7631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7684,5 +7741,5 @@
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7690,28 +7747,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "trace"
-msgstr[1] "traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7719,5 +7760,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7726,5 +7767,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7733,5 +7774,5 @@
 msgstr[1] "{0} est constitué de {1} traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7871,5 +7912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Veuille sélectionnez la rangée à éditer."
@@ -7885,5 +7926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8074,4 +8115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8640,5 +8682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Supprimer la source sélectionnée de la liste."
@@ -8850,33 +8892,34 @@
 msgstr "Supprimer la sélection dans la table des attributs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Plus d'informations à propos de cette balise"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Utiliser la balise \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "voie sans issue"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8887,15 +8930,15 @@
 msgstr "Impossible de lire la source des balises prédéfinies : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont avalisés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8905,18 +8948,18 @@
 msgstr[1] "Changer {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Rien n'est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Appliquer balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -8946,10 +8989,4 @@
 msgstr "Téléchargement des points {0} à {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8965,11 +9002,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Impossible de lire \"{0}\""
 
@@ -8988,5 +9024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "description de la trace GPS"
 
@@ -9050,5 +9086,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -9061,5 +9096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 "Erreur d'analyse syntaxique : la structure du document n’est pas valide pour "
@@ -9069,9 +9104,9 @@
 #, java-format
 msgid "Unknown mode {0}."
-msgstr ""
+msgstr "Mode {0} inconnu."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "pas de primitive d’id {0} dans le jeu de données local. Impossible de "
@@ -9126,5 +9161,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Le serveur a répondu par une erreur 404, nouvelle tentative en utilisant des "
@@ -9166,5 +9201,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi"
 
@@ -9184,5 +9219,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 "Communication établie avec {0} en utilisant le protocole de version {1}"
@@ -9191,5 +9226,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\""
 
@@ -9197,5 +9232,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "format inattendu de nouvelle version d’une primitive modifiée \"{0}\", reçu "
@@ -9204,20 +9239,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
-msgstr ""
+msgstr "Création d'un ensemble de changements…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
+msgstr "ensemble de changements {0} ouvert avec succès"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
+msgstr "Mise à jour de l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
@@ -9231,5 +9260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Pas de nouveau changement à envoyer"
 
@@ -9261,20 +9290,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9287,5 +9311,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Le serveur a renvoyé une erreur avec le code {0}"
 
@@ -9302,7 +9326,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "attribut obligatoire \"{0}\" manquant"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9312,15 +9342,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9328,11 +9358,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9351,5 +9375,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9432,5 +9456,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9438,5 +9462,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9454,15 +9478,8 @@
 msgstr "Fichiers compressés gzip du serveur OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "attribut obligatoire \"{0}\" manquant"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long, reçu "
@@ -9472,5 +9489,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long (>=0), "
@@ -9479,5 +9497,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
@@ -9487,5 +9505,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int (>=0), "
@@ -9495,5 +9513,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type booléen, "
@@ -9503,6 +9521,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type "
@@ -9517,32 +9535,37 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Le fichier \"{0}\" n'existe pas"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9554,5 +9577,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9573,5 +9596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "L’objet avec l’id=0 est illégal"
 
@@ -9580,26 +9603,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9607,10 +9619,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9622,5 +9634,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9628,5 +9640,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9634,6 +9646,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9641,5 +9653,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9648,5 +9660,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9665,10 +9677,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9701,5 +9708,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
 
@@ -9714,5 +9721,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Echec de l’ouverture de connexion à l’API {0}"
 
@@ -9723,5 +9730,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Impossible de joindre le serveur OSM. Veuillez vérifier votre connectivité "
@@ -9729,5 +9736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9737,5 +9744,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9745,5 +9752,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9784,5 +9791,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10200,5 +10207,5 @@
 "message d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10273,5 +10280,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10280,5 +10287,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10287,5 +10294,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10294,5 +10301,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10301,5 +10308,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10449,4 +10456,133 @@
 msgstr "CHarger les traces vers openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolation d’adresse"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Impair"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Pair"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10565,4 +10701,9 @@
 msgid "Error while parsing {0}"
 msgstr "Erreur pendant le traitement {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Impossible de lire \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10867,13 +11008,13 @@
 msgstr "Choisir parmi..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10887,13 +11028,13 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM est arreté pour que la modification prenne effet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11278,28 +11419,28 @@
 msgstr "Calque vide"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "N'est pas vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Est vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11310,9 +11451,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11321,5 +11462,5 @@
 "courante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de tampon de zone Lambert"
@@ -12743,13 +12884,4 @@
 msgstr "Bâtiments mitoyens"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Pair"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Impair"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12773,41 +12905,4 @@
 msgid "Optional"
 msgstr "Optionnel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Afficher la liste des auteurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Ouvrir la page utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Ouvrir la page utilisateur dans le navigateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Sélectionner les données de l'utilisateur"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Remplacer la sélection par les données utilisateurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Veuillez sélectionner quelques données"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12989,10 +13084,10 @@
 msgstr "Aucune erreur de validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Grille"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -13076,12 +13171,30 @@
 msgstr "validation autre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Validation des données"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13151,21 +13264,21 @@
 msgstr "Remplacer \"{0}\" par \"{1}\" pour"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Lignes de côte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Ce test vérifie si les lignes de côte sont correctes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Ligne de côte désordonnée"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Chemins se croisant."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13175,36 +13288,36 @@
 "croisent dans le même calque, mais ne sont pas connecté par un nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Bâtiments chevauchants"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Chemins se croisant"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 ""
 "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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nœuds à la même position"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Chemins dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13214,5 +13327,5 @@
 "coordonnées de nœuds."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Supprimer les chemins dupliqués."
@@ -13230,19 +13343,19 @@
 msgstr "Nœuds du chemin dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Nœuds avec le même nom."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 "Ce test trouve les neouds avec le même nom (ils pourraient être dupliqués)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Chemins superposés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13252,29 +13365,29 @@
 "d’un chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Zones superposées"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Routes superposées (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Chemins de fer superposés (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Chemins superposés (avec une zone)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Routes superposées"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Chemins de fer superposés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Chemins superposés"
@@ -13292,10 +13405,10 @@
 "plus d’un fois."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Chemins de nom similaire"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13304,23 +13417,23 @@
 "mal ortographiés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Vérificateur de propriétés :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Erreur d’orthographe ligne : {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13331,7 +13444,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Combinaisons étiquette/valeur non valide"
@@ -13339,43 +13452,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problème de rendu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clé \"{0}\" non valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Étiquettes avec des valeurs vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Clé de propriété invalide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 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:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -13383,39 +13496,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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 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:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 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:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 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:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Source de TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13426,21 +13539,21 @@
 "données de vérification des étiquettes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Sources de données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Vérifier les valeurs des propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -13448,9 +13561,9 @@
 "prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Vérifier les FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -13458,102 +13571,102 @@
 "étiquette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Vérifier les notes de rendu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 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:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 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:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Corriger les propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Impossible de trouver le type element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 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:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expression interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Expression rationnelle interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Chemins non fermés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Cela vérifie si les chemins censés être circulaires sont fermés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "type nature {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "type utilisation du terrain {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "type équipements {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "type sport {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "type tourise {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "type magasin {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "type loisir {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13649,5 +13762,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13663,82 +13776,82 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "zone"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Chemin non fermé"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Chemins non liés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 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:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "point final d’un chemin connecté à côté d’un autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Nœud non connectés et sans étiquettes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 "Ce test vérifie les nœuds non étiquetés qui ne font partie d'aucun chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Chemins non étiquetés, vides ou avec un seul nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
 "Ce test vérifie les chemins sans étiquette, vides ou avec un seul nœud."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Chemins non nommés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "carrefour sans nom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Chemins non étiquettés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Chemins vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Chemins à un seul nœud"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Chemins mal ordonnés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
@@ -13746,14 +13859,14 @@
 "ou des lignes de côte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
@@ -14183,6 +14296,11 @@
 "données"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14193,10 +14311,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "Une prise en charge du serveur WMS du cadastre français."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14213,10 +14331,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Créer un reseau de voies"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14225,10 +14343,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permet d’importer divers formats de fichiers directement dans JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14239,10 +14357,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Voies dupliquées avec un décalage"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14253,5 +14371,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14260,15 +14378,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualiser les informations de routage comme un claque de routage."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fourni une couche d'arrière plan affichant une grille"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14281,10 +14399,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14294,5 +14412,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14306,10 +14424,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14322,15 +14440,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d'arrière plan provenant d'OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d'OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14340,5 +14458,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14348,5 +14466,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14357,15 +14475,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "L'apparence et le ressenti du superbe JGoodies Plastic"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet aux autres applications d'envoyer des commandes vers JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14377,10 +14495,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de routage/calcul d'itinéraire"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14391,10 +14509,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -14403,5 +14521,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14414,17 +14532,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une donnée "
-"de l'utilisateur sur la carte pour ouvrir un navigateur affichant la page du "
-"profil de l'auteur."
 
 #. Plugin utilsplugin
@@ -14519,5 +14627,5 @@
 #: build/trans_presets.java:57
 msgid "Highways"
-msgstr ""
+msgstr "Routes"
 
 #. group "Highways"
@@ -17153,5 +17261,5 @@
 #: build/trans_presets.java:1250
 msgid "Transport"
-msgstr ""
+msgstr "Transport"
 
 #. group "Transport"
@@ -17971,5 +18079,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Voyage"
 
 #. group "Travel"
@@ -18593,10 +18701,10 @@
 #: build/trans_presets.java:1852
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Pierre frontalière"
 
 #. item
 #: build/trans_presets.java:1853
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Éditer Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -19405,4 +19513,24 @@
 msgstr "stadium"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19755,5 +19883,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr ""
+msgstr "Artificial"
 
 #. group "Man-Made"
@@ -20157,10 +20285,4 @@
 msgid "Country code"
 msgstr "Indicatif du pays"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolation d’adresse"
 
 #. item
@@ -21249,5 +21371,5 @@
 #: build/trans_presets.java:2758
 msgid "Geography"
-msgstr ""
+msgstr "Géographie"
 
 #. group "Places"
@@ -22955,5 +23077,5 @@
 #: build/trans_style.java:542
 msgid "motorroad"
-msgstr ""
+msgstr "voie pour véhicules à moteur"
 
 #. color street
@@ -26319,13 +26441,16 @@
 #: 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 "parameter '{0}' must not be null"
-#~ msgstr "le paramètre {0} ne peut pas être vide"
+msgstr "Czech UHUL:ORTOFOTO"
+
+#~ msgid ""
+#~ "Hailed to set reference. Reference ID {0} does not match history ID {1}."
+#~ msgstr ""
+#~ "impossible de définir la référence. la référence d’id {0} ne correspond "
+#~ "pas à l'historique d’id {1}"
 
 #~ msgid "Move"
@@ -26334,4 +26459,7 @@
 #~ 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."
@@ -26606,4 +26734,32 @@
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
 
+#~ msgid "User"
+#~ msgstr "Utilisateur"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Remplacer la sélection par les données utilisateurs"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Ouvrir la page utilisateur dans le navigateur"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Sélectionner les données de l'utilisateur"
+
+#~ msgid "Open User Page"
+#~ msgstr "Ouvrir la page utilisateur"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr ""
+#~ "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes"
+
+#~ msgid "Please select some data"
+#~ msgstr "Veuillez sélectionner quelques données"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Afficher la liste des auteurs"
+
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -26713,4 +26869,7 @@
 #~ msgstr "Interruption en cours..."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Modifications non enregistrées"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -26835,9 +26994,11 @@
 #~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste."
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- version utilisée {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une "
+#~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant "
+#~ "la page du profil de l'auteur."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26915,4 +27076,7 @@
 #~ "éléments lorsque les choix de fusion seront appliqués."
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "le paramètre {0} ne peut pas être vide"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Appliquer la résolution partielle"
@@ -26982,4 +27146,114 @@
 #~ msgstr "Erreur de communication avec le serveur"
 
+#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
+#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
+
+#~ msgid "Adjust the position of the WMS layer (raster images only)"
+#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
+#~ "couche de données ?"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Échec d’initialisation de l’API"
+
+#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
+#~ "{0}</html>"
+
+#~ msgid "No data"
+#~ msgstr "Aucune donnée"
+
+#~ msgid "Conflict created"
+#~ msgstr "conflit créé"
+
+#~ msgid "Remove relation member {0} {1}"
+#~ msgstr "supprimer le membre de la relation {0} {1}"
+
+#~ msgid "Do you really want to delete layer ''{0}''?"
+#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
+
+#~ msgid "Delete all"
+#~ msgstr "Tout supprimer"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
+#~ "été trouvés."
+
+#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+#~ msgstr ""
+#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier "
+#~ "plan. L'exception était : {0}"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
+#~ "modifications et continuer ?"
+#~ msgstr[1] ""
+#~ "Il y a des modifications non sauvegardées dans {0} calques. Ignorer les "
+#~ "modifications et continuer ?"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+
+#~ msgid "Close current changeset"
+#~ msgstr "Fermer ensemble de changements actuel"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de "
+#~ "changements et pour le laisser ouvert après l'envoi"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Envoyer avec la session de modification existante {0} et la laisser "
+#~ "ouverte pour d'autres envois."
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr ""
+#~ "Utiliser la session de modification existante {0} et la fermer après "
+#~ "l'envoi."
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
+#~ msgstr ""
+#~ "Envoyer avec la session de modification existante {0} et la fermer après "
+#~ "cet envoi."
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr ""
+#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
+
+#~ msgid "not yet decided"
+#~ msgstr "Pas encore décidé."
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
+
 #~ msgid ""
 #~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
@@ -26988,98 +27262,2 @@
 #~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A> ou <A "
 #~ "HREF=\"{1}\">French</A>."
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
-
-#~ msgid "Adjust the position of the WMS layer (raster images only)"
-#~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
-#~ "couche de données ?"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Échec d’initialisation de l’API"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
-#~ "{0}</html>"
-
-#~ msgid "No data"
-#~ msgstr "Aucune donnée"
-
-#~ msgid "Conflict created"
-#~ msgstr "conflit créé"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "supprimer le membre de la relation {0} {1}"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
-
-#~ msgid "Delete all"
-#~ msgstr "Tout supprimer"
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
-#~ "été trouvés."
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier "
-#~ "plan. L'exception était : {0}"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Fermer ensemble de changements actuel"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de "
-#~ "changements et pour le laisser ouvert après l'envoi"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la laisser "
-#~ "ouverte pour d'autres envois."
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la fermer après "
-#~ "l'envoi."
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la fermer après "
-#~ "cet envoi."
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
-
-#~ msgid "not yet decided"
-#~ msgstr "Pas encore décidé."
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-06-27 15:34+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Erro"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Cambios non gardados"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Gardar e Sair"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Descartar e Sair"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -393,4 +327,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -484,4 +466,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -496,5 +479,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -531,6 +514,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -552,39 +535,4 @@
 msgid "Please select at least three nodes."
 msgstr "Por favor, selecciona polo menos tres nodos."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -653,5 +601,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -765,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -779,5 +727,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -828,8 +776,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1000,5 +950,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "o parámetro \"{0}\" debe non ser nulo"
 
@@ -1006,5 +956,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1036,5 +986,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Edición"
@@ -1736,14 +1686,14 @@
 msgstr "Selección valeira"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "SIbir todos os cambios ó servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1752,23 +1702,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algún dato antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Non hai cambios que subir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar só {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar o paquete de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1790,17 +1740,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Detectado un conflito"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "valor retornado non esperado. Obtívose {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1816,16 +1766,17 @@
 "editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1834,23 +1785,23 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1962,8 +1913,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Non se importaron datos."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2506,4 +2453,63 @@
 msgstr "Erro durante a comunicación co servidor."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2605,6 +2611,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2629,5 +2635,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2683,5 +2689,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Separar segmento de vía"
@@ -2689,6 +2695,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2700,5 +2706,5 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2806,7 +2812,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Resolver conflitos na lista de nodos da vía {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2976,5 +2982,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2993,18 +2999,21 @@
 msgstr "Grados Minutos Segundos"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3018,41 +3027,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, 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/Filters.java:141
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3070,29 +3101,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
 
@@ -3102,33 +3134,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "non se atopou a última versión. O historial está valeiro."
 
@@ -3143,12 +3176,6 @@
 "datos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
@@ -3157,5 +3184,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
@@ -3305,5 +3332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3314,5 +3341,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3323,5 +3350,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3804,5 +3831,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "a capa non está na lista."
 
@@ -3868,5 +3895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3966,5 +3993,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3972,15 +3999,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -4036,5 +4063,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4042,5 +4069,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4048,13 +4075,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4062,5 +4090,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4077,5 +4105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4086,5 +4114,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4099,5 +4127,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4109,5 +4137,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4117,5 +4145,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4123,5 +4151,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4129,5 +4158,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4158,6 +4187,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4165,5 +4194,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4173,5 +4202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4179,5 +4208,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4374,5 +4403,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4433,5 +4462,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4439,5 +4468,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4547,14 +4576,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4563,7 +4592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4628,5 +4655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4649,4 +4676,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4804,5 +4836,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4860,5 +4892,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4897,5 +4929,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4965,5 +4997,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<diferente>"
@@ -5193,6 +5225,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5244,5 +5275,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5468,4 +5498,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5499,5 +5533,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5769,5 +5808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5775,28 +5814,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6909,4 +6947,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Descartar e Sair"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6920,4 +6962,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Gardar e Sair"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7138,6 +7184,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7253,36 +7302,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccionar as opcións de liña do debuxo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7290,5 +7339,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7297,5 +7346,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7330,4 +7379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7386,5 +7436,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
@@ -7399,5 +7449,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7405,5 +7455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7509,5 +7559,5 @@
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7515,28 +7565,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "trazado"
-msgstr[1] "trazados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7544,5 +7578,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7551,5 +7585,5 @@
 msgstr[1] "un trazado con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7558,5 +7592,5 @@
 msgstr[1] "{0} componse de {1} trazados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7686,5 +7720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Por favor selecciona a fila a editar."
@@ -7700,5 +7734,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7884,4 +7918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8443,5 +8478,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Borrar da lista a fonte seleccionada."
@@ -8653,33 +8688,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Máis información acerca desta característica"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usar axuste preestablecido \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "vía pechada"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8690,15 +8726,15 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Os elementos do tipo {0} están soportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8708,18 +8744,18 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Cambiar Propiedades"
@@ -8749,10 +8785,4 @@
 msgstr "Descargando os puntos {0} a {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8766,11 +8796,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Non se puido ler \"{0}\""
 
@@ -8789,5 +8818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "descripción de trazado gps"
 
@@ -8851,5 +8880,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8862,5 +8890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
 
@@ -8872,5 +8900,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8922,5 +8950,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8960,5 +8988,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8978,5 +9006,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}"
 
@@ -8984,5 +9012,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8990,5 +9018,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9000,10 +9028,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9022,5 +9044,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -9052,20 +9074,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9078,5 +9095,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9093,6 +9110,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9103,15 +9126,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9119,11 +9142,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9142,5 +9159,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9220,5 +9237,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9226,5 +9243,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9240,15 +9257,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9256,10 +9266,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9267,5 +9278,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9273,5 +9284,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9279,6 +9290,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9291,32 +9302,37 @@
 msgstr "Erro durante a análise."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9328,5 +9344,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9347,5 +9363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Obxecto ilegal con id=0"
 
@@ -9354,26 +9370,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9381,10 +9386,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9396,5 +9401,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9402,5 +9407,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9408,6 +9413,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9415,5 +9420,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9422,5 +9427,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9439,10 +9444,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9475,5 +9475,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9488,5 +9488,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9497,5 +9497,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Non se puido conectar co servidor osm. Por favor revisa a túa conexión a "
@@ -9503,5 +9503,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9511,5 +9511,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9519,5 +9519,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9558,5 +9558,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9962,5 +9962,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10026,5 +10026,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10033,5 +10033,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10040,5 +10040,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10047,5 +10047,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10054,5 +10054,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10192,4 +10192,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10308,4 +10437,9 @@
 msgid "Error while parsing {0}"
 msgstr "Erro durante a análise {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Non se puido ler \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10588,13 +10722,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10603,13 +10737,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10964,28 +11098,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10996,14 +11130,14 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12374,13 +12508,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12403,41 +12528,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12609,10 +12697,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12690,11 +12778,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
 msgstr ""
 
@@ -12765,21 +12871,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12787,35 +12893,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12823,5 +12929,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12839,18 +12945,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12858,29 +12964,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12896,33 +13002,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12933,7 +13039,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12941,80 +13047,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13022,131 +13128,131 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Usar ficheiro de datos por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 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:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13242,5 +13348,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13256,91 +13362,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13726,6 +13832,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13734,10 +13845,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13749,10 +13860,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13760,10 +13871,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13772,10 +13883,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13784,20 +13895,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13807,10 +13918,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13818,5 +13929,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13826,10 +13937,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13839,15 +13950,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13855,5 +13966,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13861,5 +13972,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13868,15 +13979,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13885,10 +13996,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13897,15 +14008,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13915,13 +14026,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18894,4 +18998,24 @@
 msgstr ""
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19645,10 +19769,4 @@
 #: build/trans_presets.java:2275
 msgid "Country code"
-msgstr ""
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
 msgstr ""
 
@@ -25831,4 +25949,7 @@
 #~ msgstr "Abortando..."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Cambios non gardados"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
@@ -26040,4 +26161,7 @@
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
+
+#~ msgid "No data imported."
+#~ msgstr "Non se importaron datos."
 
 #~ msgid "Data Layer"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/he.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-15 05:36+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "שגיאה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "שינויים לא שמורים"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "שמור וצא"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "התעלם משינויים וצא"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "ביטול"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "אזהרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -397,4 +331,52 @@
 msgid "Merge"
 msgstr "מזג"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "ביטול"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -488,4 +470,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -500,5 +483,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -535,6 +518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -556,41 +539,4 @@
 msgid "Please select at least three nodes."
 msgstr "נא בחר לפחות שלושה צמתים."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"אורך ערך התוית \"{0}\" על פרימיטיב {1} חורג מאורך מקסימלי אפשרי {2}. אורך "
-"הערך הוא {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -659,5 +605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -768,5 +714,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -782,5 +728,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -830,8 +776,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1002,5 +950,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
 
@@ -1008,5 +956,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1038,5 +986,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "ערוך"
@@ -1713,14 +1661,14 @@
 msgstr "בחירה ריקה"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "העלה ל-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "העלה את כל השינויים לשרת ה-OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1729,23 +1677,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "אין שינויים להעלאה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "סנכרן רק את {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "סנכרן את כל סט הנתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1759,17 +1707,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "התגלתה התנגשות"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "ערך מוחזר לא צפוי. התקבל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1780,39 +1728,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "העלאה ל-API של OSM נכשלה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1924,8 +1873,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "לא יובאו נתונים."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2453,4 +2398,65 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"אורך ערך התוית \"{0}\" על פרימיטיב {1} חורג מאורך מקסימלי אפשרי {2}. אורך "
+"הערך הוא {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2552,6 +2558,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2576,5 +2582,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2630,5 +2636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "פצל קטע דרך"
@@ -2636,6 +2642,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2646,5 +2652,5 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2750,7 +2756,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "פתור התנגשויות רשימת הנקודות בדרך {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2918,5 +2924,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2935,18 +2941,21 @@
 msgstr "מעלות דקות שניות"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "דרום"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "צפון"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "מערב"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "מזרח"
@@ -2960,41 +2969,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3012,29 +3043,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3044,33 +3076,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
 
@@ -3083,12 +3116,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3096,5 +3123,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3244,5 +3271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3253,5 +3280,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3262,5 +3289,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3741,5 +3768,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "השכבה אינה ברשימה."
 
@@ -3802,5 +3829,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3900,5 +3927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3906,15 +3933,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "הפריט {0} לא נמצא ברשימה"
 
@@ -3970,5 +3997,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים"
 
@@ -3976,5 +4003,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "העתק את האלמנטים הנבחרים שלי לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
@@ -3984,5 +4011,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "העתק את האלמנטים הנבחרים שלי אחרי האלמנט הנבחר הראשון ברשימת האלמנטים "
@@ -3990,9 +4017,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
 
@@ -4000,5 +4028,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "העתק את האלמנטים הנבחרים שלהם לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
@@ -4019,5 +4047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "העלה את האלמנט הנבחר מקום אחד"
 
@@ -4028,5 +4056,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "העלה את האלמנטים הנבחרים מקום אחד"
 
@@ -4041,5 +4069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4051,5 +4079,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "הקפה את הרשימה הנוכחית של אלמנטים ממוזגים"
 
@@ -4059,5 +4087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4065,5 +4093,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4071,5 +4100,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4100,6 +4129,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4107,5 +4136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4115,5 +4144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4121,5 +4150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "אינדקס טור לא צפוי. התקבל {0}"
 
@@ -4314,5 +4343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4373,5 +4402,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4379,5 +4408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
 
@@ -4487,14 +4516,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4503,7 +4532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4568,5 +4595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4589,4 +4616,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4742,5 +4774,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4798,5 +4830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4834,5 +4866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4902,5 +4934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<שונה>"
@@ -5126,6 +5158,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5177,5 +5208,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5401,4 +5431,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5432,5 +5466,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5698,5 +5737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5704,28 +5743,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6838,4 +6876,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "התעלם משינויים וצא"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6849,4 +6891,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "שמור וצא"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7067,6 +7113,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7182,36 +7231,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "נקודת gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7219,5 +7268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7226,5 +7275,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7259,4 +7308,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7315,5 +7365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
@@ -7328,5 +7378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7334,5 +7384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7438,5 +7488,5 @@
 msgstr "המר לשכבת GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7444,28 +7494,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "מסלול"
-msgstr[1] "מסלולים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7473,5 +7507,5 @@
 msgstr[1] "נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7480,5 +7514,5 @@
 msgstr[1] "מסלול בעל {0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7487,5 +7521,5 @@
 msgstr[1] "{0} מורכב מ-{1} מסלולים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7613,5 +7647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "נא בחר את השורה לעריכה."
@@ -7627,5 +7661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7793,4 +7827,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8332,5 +8367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "מחק את המקור הנבחר מהרשימה"
@@ -8517,33 +8552,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8554,15 +8590,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8572,18 +8608,18 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "שנה תכונות"
@@ -8613,10 +8649,4 @@
 msgstr "מוריד נקודות {0} עד {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8630,11 +8660,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "לא ניתן לקרוא את \"{0}\""
 
@@ -8651,5 +8680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "תיאור מסלול GPS"
 
@@ -8713,5 +8742,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8724,5 +8752,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
 
@@ -8734,5 +8762,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8784,5 +8812,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8822,5 +8850,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8838,5 +8866,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8844,5 +8872,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8850,5 +8878,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8862,10 +8890,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -8882,5 +8904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8912,20 +8934,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8938,5 +8955,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8953,6 +8970,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8963,15 +8986,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8979,11 +9002,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9002,5 +9019,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9078,5 +9095,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9084,5 +9101,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9098,15 +9115,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9114,10 +9124,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9125,5 +9136,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9131,5 +9142,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9137,6 +9148,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9149,32 +9160,37 @@
 msgstr "שגיאה בזמן הניתוח."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9186,5 +9202,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9205,5 +9221,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "עצם לא חוקי עם id=0"
 
@@ -9212,26 +9228,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9239,10 +9244,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9254,5 +9259,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9260,5 +9265,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9266,6 +9271,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9273,5 +9278,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9280,5 +9285,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9297,10 +9302,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9333,5 +9333,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9346,5 +9346,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9355,9 +9355,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9367,5 +9367,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9375,5 +9375,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9414,5 +9414,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9807,5 +9807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9877,5 +9877,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9884,5 +9884,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9891,5 +9891,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9898,5 +9898,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9905,5 +9905,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10043,4 +10043,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10159,4 +10288,9 @@
 msgid "Error while parsing {0}"
 msgstr "שגיאה בעת ניתוח {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "לא ניתן לקרוא את \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10443,13 +10577,13 @@
 msgstr "בחר מ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10458,13 +10592,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10817,28 +10951,28 @@
 msgstr "שכבה ריקה"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10847,14 +10981,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12231,13 +12365,4 @@
 msgstr "מדרג"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12261,41 +12386,4 @@
 msgid "Optional"
 msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "משתמש"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "פתח דף משתמש"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "פתח דף משתמש בדפדפן"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "בחר נתוני משתמש"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "החלף בחירה עם נתוני משתמש"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "בחר נתונים"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "בחר משתמש בעזרת פאנל המחברים"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "מצטער, לא עובד עם משתמשים אנונימיים"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12466,10 +12554,10 @@
 msgstr "אין שגיאות תקינות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "שריג"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12549,12 +12637,30 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "בדיקת תקינות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "בודק את תקינות הנתונים"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12624,21 +12730,21 @@
 msgstr "החלף \"{0}\" עם \"{1}\" עבור"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "קווי חוף."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "מבחן זה בודק שקווי חוף נכונים."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "קו חוף"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "דרכים חוצות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12646,35 +12752,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12682,5 +12788,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12698,18 +12804,18 @@
 msgstr "נקודות דרך כפולות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "נקודות עם אותו שם"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "דרכים חופפות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12717,29 +12823,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "שטחים חופפים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "דרכים ראשיות חופפות (עם שטח)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "מסילות רכבת חופפות (עם שטח)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "דרכים חופפות (עם שטח)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "דרכים ראשיות חופפות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "מסילות רכבת חופפות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "דרכים חופפות"
@@ -12755,33 +12861,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "דרכים בשם דומה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "בודק תכונות:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "תוסף זה מחפש שגיאות במפתחות וערכים של תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12792,7 +12898,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "צירופי תווית \\ ערך לא חוקיים"
@@ -12800,80 +12906,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "בעיית ציור"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "מפתח \"{0}\" לא תקין."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "תוויות עם ערכים ריקים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "מפתח תכונה לא תקין"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "רווח לא תקין במפתח תכונה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "ערכי תכונות מתחילים או מסתיימים ברווח"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "בדוק מפתחות תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12881,130 +12987,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "הוסף מקור חדש לרשימה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "מקורות נתונים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "בדוק ערכי תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "השתמש בברירת המחדל לקובץ בודק האיות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "תקן תכונות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "לא יכול למצוא את סוג האלמנט"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "לא יכול למצוא את דרגת האזהרה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "ביטוי לא חוקי \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "ביטוי רגולרי לא חוקי \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "דרכים בלתי סגורות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "מבחן זה בודק אם דרכים שאמורות ליהיות מעגליות אינן סגורות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "סוג ספורט {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "סוג תיירות {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "סוג חנות {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "סוג פנאי {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13100,5 +13206,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13114,91 +13220,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "שטח"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "דרך לא סגורה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "דרכים לא מחוברות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "מבחן זה בודק אם לדרך יש נקודת קצה שקרובה מאוד לדרך אחרת."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך ראשית אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "נקודת דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "נקודת קצה מחוברת של דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "נקודות לא מחוברות וללא תוויות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "מבחן זה מחפש נקודות ללא תוויות שאינן חלק מדרך."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "דרכים ללא שמות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "דרכים ללא תוויות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "דרכים ריקות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "דרכים בנות נקודה אחת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "מבחן זה בודק את הכיוון של דרכי מים, אדמה וקווי חוף."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "קו חוף הפוך: האדמה לא בצד שמאל"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "מים הפוכים: האדמה לא בצד שמאל"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "אדמה הפוכה: האדמה לא בצד שמאל"
@@ -13586,6 +13692,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13594,10 +13705,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13609,10 +13720,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13620,10 +13731,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13632,10 +13743,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13644,20 +13755,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13667,10 +13778,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13678,5 +13789,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13686,10 +13797,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13699,15 +13810,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13715,5 +13826,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13721,5 +13832,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13728,15 +13839,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13745,10 +13856,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13757,15 +13868,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13775,13 +13886,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18754,4 +18858,24 @@
 msgstr "איצטדיון"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19506,10 +19630,4 @@
 msgid "Country code"
 msgstr "קוד מדינה"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr ""
 
 #. item
@@ -25675,7 +25793,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
-
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -25684,4 +25799,7 @@
 #~ msgstr "שכבת נתונים"
 
+#~ msgid "No data imported."
+#~ msgstr "לא יובאו נתונים."
+
 #~ msgid "No document open so nothing to save."
 #~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
@@ -25698,4 +25816,7 @@
 #~ msgid "There were conflicts during import."
 #~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "שינויים לא שמורים"
 
 #~ msgid "Cannot open preferences directory: {0}"
@@ -25826,4 +25947,22 @@
 #~ msgid "Navigation"
 #~ msgstr "ניווט"
+
+#~ msgid "User"
+#~ msgstr "משתמש"
+
+#~ msgid "Please select some data"
+#~ msgstr "בחר נתונים"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "פתח דף משתמש בדפדפן"
+
+#~ msgid "Select User's Data"
+#~ msgstr "בחר נתוני משתמש"
+
+#~ msgid "Open User Page"
+#~ msgstr "פתח דף משתמש"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "מצטער, לא עובד עם משתמשים אנונימיים"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -25864,4 +26003,7 @@
 #~ msgstr "ציבורי"
 
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "בחר משתמש בעזרת פאנל המחברים"
+
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -25939,4 +26081,7 @@
 #~ msgstr "ספורט"
 
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "החלף בחירה עם נתוני משתמש"
+
 #~ msgid "Please select ways with almost right angles to orthogonalize."
 #~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
@@ -25965,7 +26110,4 @@
 #~ msgid "ways"
 #~ msgstr "דרכים"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- הגירסה שרצה היא {0}"
 
 #~ msgid ""
@@ -25975,4 +26117,7 @@
 #~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "החל פתרון חלקי"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/is.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:27+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:49+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Villa"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Óvistaðar breytingar"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Vista og hætta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Hunsa og hætta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Aðvörun"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr "Sameina"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Hætta við"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -554,39 +537,4 @@
 msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -639,10 +587,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "Loka opnum breytingarsettum"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Lokar opnum breytingarsettum"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -654,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -662,15 +610,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "Þú átt engin opin breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Engin opin breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "Niðurhel lista yfir opin breytingarsett ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -768,5 +716,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -782,5 +730,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -830,8 +778,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1002,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr ""
 
@@ -1008,5 +958,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1038,5 +988,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Breyta"
@@ -1140,9 +1090,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 msgid "Merge selection"
-msgstr ""
+msgstr "Sameina val lagi"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
 msgid "Merge the currently selected primitives into another layer"
-msgstr ""
+msgstr "Sameina valda hluti öðru lagi en þeir eru í núna"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
@@ -1713,14 +1663,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Upphala til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Upphala öllum breytingum á OSM þjóninn."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1729,23 +1679,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
-msgstr "Engar  breytingar til að hlaða upp."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1759,17 +1709,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1780,39 +1730,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+msgstr "<html>Upphal <strong>mistókst</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1924,8 +1875,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Ekki var náð í nein gögn"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2454,4 +2401,63 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Farið var umfram getu forritunarviðmótsins"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2553,6 +2559,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2577,5 +2583,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2623,4 +2629,6 @@
 "from relation?</html>"
 msgstr ""
+"<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“.<br>Eyða "
+"úr venslunum?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
@@ -2630,6 +2638,7 @@
 "</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+"<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2637,6 +2646,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2648,5 +2657,5 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2905,5 +2914,5 @@
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
-msgstr ""
+msgstr "Gat ekki hlaðið upp stillingunum. Ástæðan er: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
@@ -2920,5 +2929,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2937,18 +2946,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "A"
@@ -2959,44 +2971,66 @@
 #, java-format
 msgid "Changeset {0}"
-msgstr ""
+msgstr "Breytingarsett {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3014,29 +3048,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3046,33 +3081,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3085,12 +3121,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3098,5 +3128,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3246,5 +3276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3255,5 +3285,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3264,5 +3294,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3439,5 +3469,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
-msgstr ""
+msgstr "Niðurhel skilaboðum dagsins"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3737,5 +3767,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr ""
 
@@ -3798,5 +3828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3896,5 +3926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3902,15 +3932,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3966,5 +3996,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3972,5 +4002,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3978,13 +4008,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3992,5 +4023,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4007,5 +4038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4016,5 +4047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4029,5 +4060,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4039,5 +4070,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4047,5 +4078,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4053,5 +4084,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4059,5 +4091,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4088,6 +4120,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4095,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4103,5 +4135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4109,5 +4141,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4302,5 +4334,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4361,5 +4393,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4367,5 +4399,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4475,14 +4507,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4491,7 +4523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4556,5 +4586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4577,4 +4607,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4730,5 +4765,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4786,5 +4821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4822,5 +4857,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Sýna breytingasögu valdra hluta"
 
@@ -4890,5 +4925,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<mismunandi>"
@@ -5116,6 +5151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5167,5 +5201,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5391,4 +5424,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5422,5 +5459,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5689,5 +5731,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5695,28 +5737,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6634,10 +6675,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Opna vafra með upplýsingum um þetta breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Sýna breytingarsett {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6668,18 +6709,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Veldu þau breytingarsett sem þú vilt loka</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "Opin breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "Loka breytingarsettum"
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Loka völdum breytingarsettum"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
@@ -6689,10 +6730,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
 msgid "Closing changeset"
-msgstr ""
+msgstr "Loka breytingarsetti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Loka breytingarsetti {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6702,5 +6743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
 msgid "Select filename"
-msgstr ""
+msgstr "Velja skráarnafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6767,9 +6808,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Óvistaðar breytingar - Vista eða upphala áður en forritinu er lokað?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Óvistaðar breytingar - Vista eða upphala áður en þú eyðir?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
@@ -6829,4 +6870,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Hunsa og hætta"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6840,4 +6885,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Vista og hætta"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -6924,13 +6973,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Ætti að upphala?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Ætti að vista?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
 msgid "Filename"
-msgstr ""
+msgstr "Skráarnafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
@@ -6989,5 +7038,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Hlaða upp þessari breytingu"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
@@ -7001,9 +7050,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Hætta við að hala upp og halda áfrám að breyta"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 msgid "Upload all changes in one request"
-msgstr ""
+msgstr "Upphala öllum breytingunum í einni fyrirspurn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
@@ -7021,25 +7070,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Opna nýtt breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "Opna nýtt breytingarsett, gögnum verður bætt í það þegar þú hleður upp"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Nota opið breytingarsett"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Loka breytingarsettinu eftir að breytingunni hefur verið halið upp"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
 msgstr ""
+"Sé þetta valið verður breytingarsettinu lokað þegar þú hleður upp "
+"breytingunum. Ekki verður hægt að bæta frekari gögnum við það."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7053,13 +7104,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Loka breytingarsettinu sem nú er valið"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7175,36 +7229,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7212,5 +7266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7219,5 +7273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7252,4 +7306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7308,5 +7363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
@@ -7319,5 +7374,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
@@ -7325,5 +7380,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7425,5 +7480,5 @@
 msgstr "Breyta í GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7431,22 +7486,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
@@ -7454,5 +7493,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7460,5 +7499,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7467,5 +7506,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7474,5 +7513,5 @@
 msgstr[1] "{0} samanstendur af {1} ferlum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7600,5 +7639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Veldu hlut til að breyta fyrst."
@@ -7614,5 +7653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7780,4 +7819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8324,5 +8364,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -8503,39 +8543,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
-msgstr ""
+msgstr "Bæta við nýju taggi"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+msgstr "Eyða völdum hlutum úr listanum yfir tögg"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Nota forstillinguna „{0}“"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8546,15 +8587,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8564,18 +8605,18 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Breyta eigindum"
@@ -8605,10 +8646,4 @@
 msgstr "Hala niður punktum {0} til {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8622,11 +8657,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr ""
 
@@ -8643,5 +8677,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "lýsing á gps ferli"
 
@@ -8703,5 +8737,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8714,5 +8747,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
@@ -8724,5 +8757,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8774,5 +8807,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8812,5 +8845,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8828,5 +8861,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8834,5 +8867,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8840,5 +8873,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8850,20 +8883,14 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
+msgstr "Opnaði breytingarsett {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
+msgstr "Uppfæri breytingarsett.."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
+msgstr "Uppfæri breytingarsett {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
@@ -8872,5 +8899,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8902,20 +8929,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8928,5 +8950,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8943,6 +8965,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8953,15 +8981,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8969,11 +8997,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -8992,5 +9014,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9069,5 +9091,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9075,5 +9097,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9089,15 +9111,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9105,10 +9120,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9116,5 +9132,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9122,5 +9138,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9128,6 +9144,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9140,32 +9156,37 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9177,5 +9198,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9196,5 +9217,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Ógildur hlutur með kenni=0"
 
@@ -9203,26 +9224,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9230,10 +9240,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9245,5 +9255,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9251,5 +9261,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9257,6 +9267,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9264,5 +9274,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9271,5 +9281,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9284,14 +9294,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr ""
+msgstr "Undirbý gögn..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9306,9 +9311,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Niðurhel lista yfir opin breytingarsett ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Niðurhel breytingarsettum ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
@@ -9324,5 +9329,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9337,5 +9342,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9346,10 +9351,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9359,5 +9364,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9367,5 +9372,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9377,15 +9382,15 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp hnút ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp veg ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp venslum ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
@@ -9395,5 +9400,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Hleð upp gögnum ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
@@ -9406,5 +9411,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9509,5 +9514,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
 msgid "Keep plugin"
-msgstr ""
+msgstr "Halda viðbótinni"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
@@ -9805,5 +9810,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9875,5 +9880,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9882,5 +9887,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9889,5 +9894,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9896,5 +9901,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9903,5 +9908,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10041,4 +10046,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10152,4 +10286,9 @@
 #, java-format
 msgid "Error while parsing {0}"
+msgstr ""
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
 msgstr ""
 
@@ -10433,13 +10572,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10448,13 +10587,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10807,28 +10946,28 @@
 msgstr "Tómt lag"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10837,14 +10976,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12215,13 +12354,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12244,41 +12374,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12451,10 +12544,10 @@
 msgstr "Engar villur fundust við athugun"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12532,12 +12625,30 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Athugun"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Athuga gögnin"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12607,21 +12718,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Strandlengjur."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12629,35 +12740,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12665,5 +12776,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12681,18 +12792,18 @@
 msgstr "Hnútur endurtekinn í vegi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12700,29 +12811,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12738,33 +12849,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Vegir með svipuð nöfn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12773,7 +12884,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12781,80 +12892,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12862,130 +12973,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ógild regluleg segð \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "gerð landnotkunar {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "gerð frístunda {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13081,5 +13192,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13095,91 +13206,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Ónefndir vegir"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Vegir án eiginda"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13565,6 +13676,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13573,10 +13689,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13588,10 +13704,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13599,10 +13715,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13611,10 +13727,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13623,20 +13739,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13646,10 +13762,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13657,5 +13773,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13665,10 +13781,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13678,15 +13794,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13694,5 +13810,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13700,5 +13816,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13707,15 +13823,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13724,10 +13840,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13736,15 +13852,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13754,13 +13870,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18733,4 +18842,24 @@
 msgstr "íþróttaleikvangur"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19485,10 +19614,4 @@
 msgid "Country code"
 msgstr "Landskóði"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr ""
 
 #. item
@@ -25657,4 +25780,7 @@
 #~ msgstr "Hætti við..."
 
+#~ 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ð."
@@ -25777,7 +25903,4 @@
 #~ msgstr "kort"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "{0}"
-
 #~ msgid "nodes"
 #~ msgstr "hnútar"
@@ -25805,4 +25928,7 @@
 #~ "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 "Deleting layer {0} of {1}"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/it.po	(revision 17764)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:48+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:14+0000\n"
 "Last-Translator: FabC <f.carrai@iol.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,8 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:25+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -22,5 +22,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -29,5 +29,5 @@
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -35,9 +35,9 @@
 "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -74,6 +74,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -88,4 +88,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -101,6 +106,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -108,86 +113,11 @@
 msgstr "Errore"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti e "
-"continuare?"
-msgstr[1] ""
-"Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti e "
-"continuare?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Modifiche non salvate"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Salva ed Esci"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Annulla ed Esci"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -209,7 +139,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -223,5 +153,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -248,13 +178,13 @@
 msgstr "Attenzione"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -402,4 +332,52 @@
 msgid "Merge"
 msgstr "Unisci"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Annulla"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -494,4 +472,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -506,5 +485,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -541,6 +520,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -562,47 +541,4 @@
 msgid "Please select at least three nodes."
 msgstr "Selezionare almeno tre nodi."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Il numero di cambiamenti corrente supera il numero massimo consentito, ora "
-"sono {0}, il massimo è {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Violazione delle capacità delle API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Attenzione: troncamento automatico del valore del tag {0} sulla primitiva "
-"cancellata {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"La lunghezza del valore del tag \"{0}\" sulla primitiva {1} eccede la "
-"massima lunghezza ammessa {2}. La lunghezza del valore è {3}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Violazione della precondizione"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} nodi nel percorso {1} superano il massimo consentito. numero di nodi "
-"permesso {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -671,5 +607,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -787,5 +723,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -801,5 +737,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -849,8 +785,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1023,5 +961,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "il parametro ''{0}'' non deve essere nullo"
 
@@ -1029,5 +967,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
 
@@ -1059,5 +997,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Modifica"
@@ -1768,14 +1706,14 @@
 msgstr "Selezione vuota"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Carica su OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Carica tutti i cambiamenti sul server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1784,23 +1722,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizza solamente {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Sincronizza l'intero dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1823,17 +1761,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Rilevato un conflitto"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "Valore di ritorno inatteso. Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1849,16 +1787,17 @@
 "continuare ad apportare delle modifiche.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1867,5 +1806,5 @@
 "atteso \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1873,18 +1812,18 @@
 "L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Invio alle API di OSM fallito"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Aggiornamento della primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1996,8 +1935,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Nessun dato importato."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2559,4 +2494,71 @@
 msgstr "Errore durante la comunicazione con il server"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Il numero di cambiamenti corrente supera il numero massimo consentito, ora "
+"sono {0}, il massimo è {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Violazione delle capacità delle API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Attenzione: troncamento automatico del valore del tag {0} sulla primitiva "
+"cancellata {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"La lunghezza del valore del tag \"{0}\" sulla primitiva {1} eccede la "
+"massima lunghezza ammessa {2}. La lunghezza del valore è {3}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Violazione della precondizione"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} nodi nel percorso {1} superano il massimo consentito. numero di nodi "
+"permesso {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2658,6 +2660,6 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
 
@@ -2684,5 +2686,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "non è possibile risolvere il conflitto irrisolto"
 
@@ -2738,5 +2740,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Dividi il segmento del percorso"
@@ -2744,6 +2746,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2755,5 +2757,5 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Conferma di cancellazione"
@@ -2859,7 +2861,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3030,5 +3032,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
 
@@ -3047,18 +3049,21 @@
 msgstr "Gradi Minuti Secondi"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -3072,41 +3077,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3124,29 +3151,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3156,33 +3184,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
 
@@ -3195,12 +3224,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3208,5 +3231,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
 
@@ -3356,5 +3379,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3365,5 +3388,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3374,5 +3397,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3863,5 +3886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "livello non in lista."
 
@@ -3925,5 +3948,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "il ruolo {0} non partecipa nella comparazione {1}"
 
@@ -4027,5 +4050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "parametro attualmente fuori scala: ottenuto {0}"
 
@@ -4033,15 +4056,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "elemento {0} non trovato nella lista"
 
@@ -4103,5 +4126,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Copia i miei elementi selezionati alla fine della lista degli elementi uniti"
@@ -4110,5 +4133,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copia i miei elementi selezionati prima del primo elemento selezionato nella "
@@ -4118,5 +4141,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copia i miei elementi selezionati dopo il primo elemento selezionato nella "
@@ -4124,5 +4147,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copia il loro elemento selezionato all'inizio della lista degli elementi "
@@ -4130,5 +4154,5 @@
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copia i loro elementi selezionati alla fine della lista degli elementi uniti"
@@ -4137,5 +4161,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copia i loro elementi selezionati prima del primo elemento selezionato nella "
@@ -4156,5 +4180,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Sposta in su gli elementi selezionati di una posizione"
 
@@ -4165,5 +4189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Sposta in giù le voci selezionate di una posizione"
 
@@ -4178,5 +4202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
 
@@ -4188,5 +4212,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Blocca la lista attuale degli elementi uniti"
 
@@ -4196,5 +4220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione"
 
@@ -4202,5 +4226,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clicca <strong>{0}</strong> per iniziare l'unione tra le voci "
@@ -4210,5 +4235,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4241,15 +4266,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"adjustable {0} non ancora registrato. Non è possibile impostare la "
-"partecipazione nella regolazione sincronizzata"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "adjustable {0} non ancora registrato"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4258,5 +4281,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "L'unione dei nodi non è stata ancora bloccata. Non è possibile costruire il "
@@ -4266,5 +4289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "indice di colonna non atteso. Ottenuto {0}"
 
@@ -4466,5 +4489,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "nodi uniti non ancora bloccati. Non è possibile costruire il comando di "
@@ -4529,5 +4552,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione"
 
@@ -4535,5 +4558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
 
@@ -4645,14 +4668,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4661,7 +4684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4726,5 +4747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4747,4 +4768,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4903,5 +4929,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4959,5 +4985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "indice fuori dai limiti Ottenuto {0}"
 
@@ -4995,5 +5021,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Visualizza lo storico della primitiva selezionata"
 
@@ -5063,5 +5089,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<diverso>"
@@ -5291,6 +5317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5342,5 +5367,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5566,4 +5590,8 @@
 msgstr "Conferma ruolo vuoto"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5597,5 +5625,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5866,5 +5899,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5872,14 +5905,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 "storico non ancora inizializzato. E' fallito il tentativo di impostare la "
@@ -5888,5 +5923,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5894,9 +5931,4 @@
 msgid "Load history"
 msgstr "Carica storico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -7008,4 +7040,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Annulla ed Esci"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7019,4 +7055,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Salva ed Esci"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7240,6 +7280,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7355,36 +7398,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7392,5 +7435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7399,5 +7442,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7432,4 +7475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7488,5 +7532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
@@ -7501,5 +7545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7507,5 +7551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7616,5 +7660,5 @@
 msgstr "Converti in un layer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7622,28 +7666,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "traccia"
-msgstr[1] "tracce"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7651,5 +7679,5 @@
 msgstr[1] "punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7658,5 +7686,5 @@
 msgstr[1] "una traccia con {0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7665,5 +7693,5 @@
 msgstr[1] "{0} è composto da {1} tracce"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7797,5 +7825,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Scegli la riga da modificare."
@@ -7811,5 +7839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8000,4 +8028,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8569,5 +8598,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Elimina la sorgente selezionata nella lista."
@@ -8782,33 +8811,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usa la preimpostazione ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "percorso chiuso"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8819,15 +8849,15 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8837,18 +8867,18 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Modifica Proprietà"
@@ -8878,10 +8908,4 @@
 msgstr "Scaricamento dei punti da {0} a {1} in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8895,11 +8919,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Impossibile leggere \"{0}\""
 
@@ -8918,5 +8941,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "descrizione della traccia GPS"
 
@@ -8980,5 +9003,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8991,5 +9013,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 "Errore di scansione: struttura del documento non valida per un documento gpx"
@@ -9002,5 +9024,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -9053,5 +9075,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Il server ha risposto con il codice 404, ritento con una richiesta per ogni "
@@ -9093,5 +9115,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi"
 
@@ -9111,5 +9133,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 "Le comunicazioni con {0} sono state instaurate mediante la versione {1} del "
@@ -9119,5 +9141,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -9125,5 +9147,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9135,10 +9157,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9157,5 +9173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 "Non è presente alcun gruppo di modifiche per il caricamento differenziale"
@@ -9188,20 +9204,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9214,5 +9225,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Il server ha restituito un errore con codice {0}"
 
@@ -9229,7 +9240,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "attributo obbligatorio ''{0}'' mancante"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9239,15 +9256,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9255,11 +9272,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9278,5 +9289,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9359,5 +9370,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9365,5 +9376,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9379,15 +9390,8 @@
 msgstr "File compressi gzip del server OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "attributo obbligatorio ''{0}'' mancante"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo long, ricevuto "
@@ -9397,5 +9401,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo long (>=0), "
@@ -9404,5 +9409,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
@@ -9412,5 +9417,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), "
@@ -9420,5 +9425,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, "
@@ -9428,6 +9433,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "valore non valido per attributo obbligatorio ''{0}'' di tipo "
@@ -9442,32 +9447,37 @@
 msgstr "Errore nella scansione."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "il file \"{0}\" non esiste"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9479,5 +9489,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9498,5 +9508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Oggetto illegale con id=0"
 
@@ -9505,26 +9515,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9532,10 +9531,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9547,5 +9546,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9553,5 +9552,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9559,6 +9558,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9566,5 +9565,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9573,5 +9572,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9590,10 +9589,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9626,5 +9620,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
 
@@ -9639,5 +9633,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "E' fallita l'apertura della connessione alle API {0}"
 
@@ -9648,5 +9642,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Impossibile connettersi al server osm. Controllare la propria connessione ad "
@@ -9654,5 +9648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9662,5 +9656,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9670,5 +9664,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9709,5 +9703,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10125,5 +10119,5 @@
 "messaggio di errore è:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10202,5 +10196,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10209,5 +10203,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10216,5 +10210,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10223,5 +10217,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10230,5 +10224,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10370,4 +10364,133 @@
 msgstr "Carica i tracciati su openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolazione indirizzo"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Dispari"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Pari"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10486,4 +10609,9 @@
 msgid "Error while parsing {0}"
 msgstr "Impossibile interpretare {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Impossibile leggere \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10781,13 +10909,13 @@
 msgstr "Scegliere da..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10800,13 +10928,13 @@
 "Si desidera ripristinare F11 per l'azione di cattura ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Ripristino della scorciatoia F11 di cattura"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11183,28 +11311,28 @@
 msgstr "Livello vuoto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Layer WMS ({0}), {1} tile scaricate"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Non è vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Dimensioni raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "E' stato vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11215,9 +11343,9 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11226,5 +11354,5 @@
 "corrente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Errore nella zona di Lambert della cache"
@@ -12648,13 +12776,4 @@
 msgstr "Complesso"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Pari"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Dispari"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12678,41 +12797,4 @@
 msgid "Optional"
 msgstr "Opzionale"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Utente"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Visualizza il pannello degli autori"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Apri la pagina dell'utente"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Apri la pagina dell'utente nel browser"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Seleziona i dati dell'utente"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Sostituisci la selezione con i dati dell'utente"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Selezionare alcuni dati"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Scegliere un utente mediante il pannello degli autori"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Spiacente, ma non funziona con gli utenti anonimi"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12897,10 +12979,10 @@
 msgstr "Nessun errore individuato"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Griglia"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12985,12 +13067,30 @@
 msgstr "altra validazione"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Convalida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Esegue la convalida dei dati"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13060,21 +13160,21 @@
 msgstr "Sostituisci \"{0}\" con \"{1}\" per"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Linee di costa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Questo controllo analizza che le linee di costa siano corrette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Linea di costa senza ordinamento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Percorsi incrociati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13082,35 +13182,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Percorsi incrociati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nodi duplicati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Questo test verifica che non ci siano due nodi nella stessa posizione."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13118,5 +13218,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -13134,10 +13234,10 @@
 msgstr "Nodi dei percorsi duplicati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Nodi con lo stesso nome"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -13145,9 +13245,9 @@
 "duplicati)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Percorsi sovrapposti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13157,29 +13257,29 @@
 "più di un percorso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Aree sovrapposte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Strade sovrapposte (con area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Ferrovie coincidenti (con area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Percorsi sovrapposti (con area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Strade sovrapposte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Ferrovie sovrapposte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Percorsi sovrapposti"
@@ -13197,10 +13297,10 @@
 "una volta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Percorsi con nomi simili"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13209,9 +13309,9 @@
 "errori d'ortografia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Analizzatore delle proprietà :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
@@ -13219,15 +13319,15 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Linea TagChecker non valida - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Linea di correzione ortografica non valida: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13238,7 +13338,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Combinazione illegale etichetta/valore"
@@ -13246,60 +13346,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problema di disegno"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Chiave ''{0}'' non valida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Tag con valori vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "chiave della proprietà non valida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 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:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 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:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Valore ''{0}'' per la chiave ''{1}'' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 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:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Verifica le chiavi delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -13307,22 +13407,22 @@
 "valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Usa un analizzatore delle proprietà complesso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Sorgente TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13333,21 +13433,21 @@
 "delle etichette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Sorgenti dei dati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Verifica i valori delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -13355,9 +13455,9 @@
 "validi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Cerca FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -13365,102 +13465,102 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Controllare le note di disegno."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Usa file dati predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Usa file di controllo ortografico predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Correggi proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Impossibile trovare il tipo di elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Impossibile trovare il livello di avvertimento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Espressione illegale \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Espressione regolare \"{0}\" non valida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Percorsi non chiusi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Controlla se i percorsi che dovrebbero essere circolari siano chiusi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "elemento naturale tipo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "tipologia di area {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "struttura di servizio di tipo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "Tipo di sport {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "Tipo di turismo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "tipo di negozio {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "struttura per lo svago di tipo {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13556,5 +13656,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13570,43 +13670,43 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "area"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Percorso non chiuso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Percorsi non connessi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Questo test controlla se una via finisce molto vicina ad un'altra via."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 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:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Nodo finale della strada collegata vicino ad un'altra strada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Nodi senza etichetta e non connessi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13614,9 +13714,9 @@
 "percorso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Percorsi senza etichetta, vuoti e composti da un singolo nodo."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
@@ -13624,29 +13724,29 @@
 "nodo."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Percorsi senza nome"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Incrocio senza nome"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Percorsi senza etichetta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Percorsi vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Percorsi composti da un singolo nodo"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Percorsi con verso non corretto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
@@ -13654,13 +13754,13 @@
 "delle linee di costa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Terraferma invertita: manca la terraferma sul lato sinistro"
@@ -14088,6 +14188,11 @@
 "dati"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14098,5 +14203,5 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -14104,5 +14209,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14120,10 +14225,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Crea un reticolo di ways"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14133,10 +14238,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permette l'importazione di file di vario formato direttamente in JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14147,10 +14252,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Duplica i percorsi con una differenza"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14161,5 +14266,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14168,5 +14273,5 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
@@ -14174,10 +14279,10 @@
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14191,10 +14296,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14204,5 +14309,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14216,10 +14321,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14233,15 +14338,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14251,5 +14356,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14259,5 +14364,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14268,15 +14373,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14288,10 +14393,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14302,15 +14407,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14324,17 +14429,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa che "
-"appartengono ad un utente selezionato, apre il browser per la "
-"visualizzazione della pagina del profilo dell'autore."
 
 #. Plugin utilsplugin
@@ -19314,4 +19409,24 @@
 msgstr "stadio"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -20066,10 +20181,4 @@
 msgid "Country code"
 msgstr "Codice nazione"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolazione indirizzo"
 
 #. item
@@ -26236,6 +26345,6 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "il parametro '{0}' non deve essere nullo"
+#~ msgid "No data imported."
+#~ msgstr "Nessun dato importato."
 
 #~ msgid "Data Layer"
@@ -26595,6 +26704,30 @@
 #~ "Non caricarire nessun dato dopo questo messaggio."
 
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Sostituisci la selezione con i dati dell'utente"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Apri la pagina dell'utente nel browser"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Visualizza il pannello degli autori"
+
+#~ msgid "Open User Page"
+#~ msgstr "Apri la pagina dell'utente"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Seleziona i dati dell'utente"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossibile aprire la cartella delle preferenze: {0}"
+
+#~ msgid "Please select some data"
+#~ msgstr "Selezionare alcuni dati"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Scegliere un utente mediante il pannello degli autori"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Spiacente, ma non funziona con gli utenti anonimi"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -26735,22 +26868,20 @@
 #~ msgstr "Tipo di tabellone"
 
+#~ msgid "User"
+#~ msgstr "Utente"
+
 #~ msgid "sports"
 #~ msgstr "Articoli sportivi"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- la versione in esecuzione è {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
-#~ "<A HREF=\"{1}\">la propria lingua</A>."
-
 #~ msgid "Directly load TCX files from JOSM."
 #~ msgstr "Carica i file TCX direttamente da JOSM."
+
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa "
+#~ "che appartengono ad un utente selezionato, apre il browser per la "
+#~ "visualizzazione della pagina del profilo dell'autore."
 
 #~ msgid ""
@@ -26777,4 +26908,7 @@
 #~ "\n"
 #~ "{0}"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Modifiche non salvate"
 
 #~ msgid "Version number missing from OSM data"
@@ -26826,4 +26960,7 @@
 #~ msgstr "Applica risoluzioni parziali"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "il parametro '{0}' non deve essere nullo"
+
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr ""
@@ -26915,4 +27052,15 @@
 #~ msgstr "Elimina tutto"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
+#~ msgstr[1] ""
+#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti "
+#~ "e continuare?"
+
 #~ msgid "There is currently no changeset open."
 #~ msgstr "Attualmente non ci sono changeset aperti."
@@ -26930,2 +27078,12 @@
 #~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere "
 #~ "il changeset dopo il caricamento"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
+#~ "<A HREF=\"{1}\">la propria lingua</A>."
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:28+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:29+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "投影法 {0} は、使用可能できませんでした。メルカトル図法を使います。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "エラー"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "保存されていない変更"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "保存して終了"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "変更を破棄して終了"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -401,4 +335,52 @@
 msgid "Merge"
 msgstr "マージ"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "キャンセル"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -494,4 +476,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -506,5 +489,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -541,6 +524,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -563,43 +546,4 @@
 msgstr "少なくとも3つのノードを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "API機能違反"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}"
-"です。値の長さは{3}です。"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
-
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
@@ -652,10 +596,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
 msgid "Close open changesets"
-msgstr ""
+msgstr "開かれた変更セットを閉じます"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "開かれた変更セットを閉じます"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -667,5 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -675,15 +619,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:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "開かれた変更セットはありません"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
+msgstr "開かれた変更セットをダウンロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -780,5 +724,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -794,5 +738,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -842,8 +786,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1014,5 +960,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "パラメータ ''{0}'' はヌルでなければなりません"
 
@@ -1020,5 +966,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 "OSMデータレイヤーかGPXレイヤーのインスタンスであると期待しています。 "
@@ -1052,5 +998,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "編集"
@@ -1750,14 +1696,14 @@
 msgstr "選択は空です"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1768,23 +1714,23 @@
 "さい。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "{0} {1} だけを同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "データセット全体を同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1806,17 +1752,17 @@
 "リックしてください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "競合が検出されました"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1832,39 +1778,40 @@
 "てください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+msgstr "変更セットは閉じられました"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "OSM API へのアップロード失敗"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "プリミティブ更新中"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1976,8 +1923,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "データーはインポートされませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2250,5 +2193,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "フィルター文字列を入力してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2389,5 +2332,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Submit filter"
-msgstr ""
+msgstr "フィルターを登録"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2525,4 +2468,70 @@
 msgid "Error while communicating with server."
 msgstr "サーバとの通信中にエラー。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API機能違反"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは{2}"
+"です。値の長さは{3}です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "リレーション間の循環依存:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
+"<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を解消"
+"してください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "リレーション ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... リレーションを参照"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "循環依存"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2626,9 +2635,9 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"警告: レイヤー ''{0}'' は、もうぞんざいしません。プリミティブ ''{1}'' での競"
-"合も取り除けません。"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+"警告: レイヤー ''{0}'' は既に存在しません。プリミティブ ''{1}'' の競合を解消"
+"できません"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2653,5 +2662,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "未決の競合を解決できません"
 
@@ -2707,5 +2716,5 @@
 "ンから削除しますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "ウェイのセグメントを分割"
@@ -2713,6 +2722,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2724,5 +2733,5 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "削除確認"
@@ -2828,7 +2837,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "ウェイ {0} のノードリストの競合を解決"
+msgstr "ウェイ {0} のノードリスト中の競合を解決"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3016,5 +3025,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "プリミティブ ''{0}'' には既に競合が登録されています"
 
@@ -3033,18 +3042,21 @@
 msgstr "度分秒"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "西"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "東"
@@ -3058,41 +3070,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "テキスト"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3110,24 +3144,25 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
@@ -3135,5 +3170,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取り"
@@ -3145,34 +3180,35 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr "この履歴にはバージョン {0} のプリミティブはありません"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "前のバージョンがありません。履歴は空です。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "最新のバージョンがありません。履歴は空です。"
 
@@ -3185,13 +3221,6 @@
 msgstr "このデータセットには id {0} バージョン {1} のプリミティブはありません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-"パラメータ ''{0}'' > 0 である必要がありますが、 ''{1}'' を受け取りました"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
 
@@ -3199,5 +3228,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
 
@@ -3350,5 +3379,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3358,5 +3387,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3366,5 +3395,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3687,4 +3716,7 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
+"通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要で"
+"す\n"
+"      確保されたメモリの最大サイズを増やすJava オプション"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
@@ -3846,9 +3878,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
 msgid "User:"
-msgstr ""
+msgstr "ユーザ:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "レイヤーがリストにありません。"
 
@@ -3911,5 +3943,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "ロール {0} は比較ペア {1} に参加していません"
 
@@ -4013,5 +4045,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
 
@@ -4019,15 +4051,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "ロール {0} のリストは現在比較ペアに参加していません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "パラメータ \"index\" におかしな値。入力値: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "アイテム {0} はリストに見つかりません"
 
@@ -4085,5 +4117,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "自分の選択した要素を結合された要素リストの最後にコピー"
 
@@ -4091,5 +4123,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "自分の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
@@ -4098,14 +4130,15 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "自分の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "相手の選択した要素を、結合された要素リストの最後にコピー"
 
@@ -4113,5 +4146,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
@@ -4130,5 +4163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "同じ位置で選択した要素を上に移動"
 
@@ -4139,5 +4172,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "同じ位置で選択したエントリを下に移動"
 
@@ -4152,5 +4185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "結合された要素のリストから選択したエントリを削除"
 
@@ -4162,5 +4195,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "結合された要素の現在のリストを固定"
 
@@ -4170,5 +4203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "結合された要素のリスト固定を解除して結合をはじめる"
 
@@ -4176,5 +4209,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</"
@@ -4184,5 +4218,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4212,6 +4246,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4219,5 +4253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4227,5 +4261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "結合されたノードがまだ固定されていません。解決コマンドをビルドできません"
@@ -4234,5 +4268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "おかしなカラムインデックス。入力値: {0}"
 
@@ -4438,5 +4472,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "結合されたノードはまだ固定されていません。解決コマンドをビルドできません"
@@ -4498,5 +4532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "未決のタグ結合アイテムを適用できません"
 
@@ -4504,5 +4538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
@@ -4613,10 +4647,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "パラメータ ''{0}'' は空以外でなければなりません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 "
@@ -4624,5 +4658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "タグコレクションには選択された値 ''{0}'' が含まれていません"
 
@@ -4631,88 +4665,91 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+msgid "Not decided yet."
+msgstr "未決定です"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "ノードからのタグ"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "ウェイからのタグ"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "リレーションからのタグ"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "貼り付けられたタグの競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0}ウェイ"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} 関連"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "Paste ..."
+msgstr "貼り付け ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "From ..."
+msgstr "元: ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+msgid "To ..."
+msgstr "先: ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} タグ"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgid "Remove this relation member from the relation"
+msgstr "このリレーションメンバーをこのリレーションから除きます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
+msgid "Replace"
+msgstr "置換"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
+msgid "Replace the way this member refers to with the combined way"
+msgstr "このメンバーが参照しているウェイを統合するウェイと置き換えてください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgid "Undecided"
+msgstr "未確定"
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
 msgstr "未決定です"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
-msgid "Tags from nodes"
-msgstr "ノードからのタグ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
-msgid "Tags from ways"
-msgstr "ウェイからのタグ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
-msgid "Tags from relations"
-msgstr "リレーションからのタグ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
-msgid "Conflicts in pasted tags"
-msgstr "貼り付けられたタグの競合"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0}ウェイ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} 関連"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "Paste ..."
-msgstr "貼り付け ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "From ..."
-msgstr "元: ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
-msgid "To ..."
-msgstr "先: ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
-#, java-format
-msgid "{0} tag"
-msgid_plural "{0} tags"
-msgstr[0] "{0} タグ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
-#, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
-msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-msgid "Remove this relation member from the relation"
-msgstr "このリレーションメンバーをこのリレーションから除きます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "置換"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr "このメンバーが参照しているウェイを統合するウェイと置き換えてください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-msgid "Undecided"
-msgstr "未確定"
 
 #. --- role editing
@@ -4854,5 +4891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "オブジェクトにフィルタをかけ、非表示/無効にします。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -4867,5 +4904,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4874,33 +4911,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "フィルターを追加。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "フィルターを編集。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "フィルターを削除。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "フィルターを上に移動。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "フィルターを下に移動。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "フィルターを有効化"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "要素を非表示にする"
 
 #: ../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
@@ -4910,5 +4947,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "フィルターモード"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -4923,5 +4960,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "範囲外のインデックス。{0} を受け取りました"
 
@@ -4959,5 +4996,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "選択されたプリミティブの履歴を表示"
 
@@ -5028,5 +5065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<差異あり>"
@@ -5255,6 +5292,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
 
@@ -5307,5 +5343,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5552,4 +5587,8 @@
 msgstr "空のロールを確認"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5583,6 +5622,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5643,5 +5687,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
-msgstr ""
+msgstr "ロケーション名"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
@@ -5853,5 +5897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
@@ -5860,19 +5904,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5880,9 +5928,4 @@
 msgid "Load history"
 msgstr "履歴をロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr "id > 0 でなければなりませんが、{0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6817,13 +6860,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "変更セットID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "作成日:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "変更セットのコメント:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -6833,22 +6876,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>閉じる変更セットを選んでください</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "変更セットを開く"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "変更セットを閉じる"
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "選択済みの開かれた変更セットを閉じる"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "変更セットを閉じる操作をキャンセル"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
@@ -6859,5 +6902,5 @@
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "変更セット {0} を閉じています"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6888,5 +6931,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "レイヤー ''{0}'' にはアップロードする変更がありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
@@ -6896,9 +6939,10 @@
 "''{1}''."
 msgstr ""
+"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき変更があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "レイヤー ''{0}'' には保存すべき変更はありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
@@ -7001,4 +7045,8 @@
 msgstr "ダイアログを閉じてJOSMでの編集に戻る"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "変更を破棄して終了"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7012,4 +7060,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "保存せずにレイヤーを削除。未保存の変更は失われます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "保存して終了"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7176,5 +7228,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 msgid "Upload all changes in one request"
-msgstr ""
+msgstr "ひとつのリクエストで全ての変更をアップロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
@@ -7192,21 +7244,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 msgid "Open a new changeset"
-msgstr ""
+msgstr "新しい変更セットを開く"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "新しい変更セットを開き、次回アップロードで使用"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 msgid "Use an open changeset"
-msgstr ""
+msgstr "開かれた変更セットを使用"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "既に開かれた変更セットにデータをアップロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "アップロード後に変更セットを閉じる"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
@@ -7224,13 +7276,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "自分の開いた変更セットのリストをサーバからロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "現在選択済みの開かれた変更セットを閉じる"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7345,36 +7400,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPSポイント"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7382,5 +7437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7389,5 +7444,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7422,4 +7477,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7436,6 +7492,5 @@
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} トラック"
 
 #. item "Relations/Route" text "Symbol description"
@@ -7476,5 +7531,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
@@ -7490,5 +7545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7496,5 +7551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7602,5 +7657,5 @@
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7608,32 +7663,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "トラック"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7641,5 +7681,5 @@
 msgstr[0] "{0}ポイントをもつトラック"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7647,5 +7687,5 @@
 msgstr[0] "{1}トラックを含む {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7776,5 +7816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "編集する列を選択してください。"
@@ -7790,5 +7830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7968,4 +8008,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8512,5 +8553,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "リストから選択した情報源を削除"
@@ -8704,33 +8745,34 @@
 msgstr "タグテーブルの選択を削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "この機能の詳細情報"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "プリセット \"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8741,15 +8783,15 @@
 msgstr "タグの事前設定ソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8758,18 +8800,18 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -8799,10 +8841,4 @@
 msgstr "{1}にポイント{0}をダウンロード中..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8816,11 +8852,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr "\"{0}\" をエクスポートできません"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "\"{0}\"を読み込めません。"
 
@@ -8839,5 +8874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "gpsトラックの記述"
 
@@ -8901,5 +8936,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8912,5 +8946,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
 
@@ -8922,5 +8956,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "id {0} のプリミティブはローカルデータセットにはありません。プリミティブタイプ"
@@ -8974,5 +9008,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試"
@@ -9014,5 +9048,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません"
 
@@ -9032,5 +9066,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。"
 
@@ -9038,5 +9072,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "おかしな形式のID がサーバから返されました。入力値: ''{0}''"
 
@@ -9044,5 +9078,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "変更されたプリミティブ ''{0}'' の新しいバージョンにおかしな形式。入力値: "
@@ -9058,10 +9092,4 @@
 msgstr "変更セット {0} を開きました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9078,5 +9106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "diffアップロードのための変更セットを用意できませんでした。"
 
@@ -9108,20 +9136,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
-msgstr ""
+msgid "Current changeset is null. Can't upload data."
+msgstr "現在の変更セットはヌルです。データをアップロードできません。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9134,5 +9157,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "サーバがエラーを返しました。コード {0}"
 
@@ -9149,7 +9172,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "必須の属性 ''{0}'' がありません"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9159,15 +9188,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9175,12 +9204,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "XML 要素 {1} に必要な属性 ''{0}'' がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "必要な属性 ''{0}'' がありません"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
@@ -9194,14 +9217,15 @@
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
 msgstr ""
+"入力ストリームに未定義の要素 ''{0}'' が見つかりました。異常終了します。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "変更セットのリストを解析中..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
@@ -9263,5 +9287,5 @@
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(場所: 行 {0}, カラム {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
@@ -9273,9 +9297,9 @@
 #, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr ""
+msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr "<html>保存中にエラー発生。<br>エラー: <br>{0}</html>"
 
@@ -9283,5 +9307,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9299,15 +9323,8 @@
 msgstr "OSMサーバファイルがgzip 圧縮されました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "必須の属性 ''{0}'' がありません"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
@@ -9315,10 +9332,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
@@ -9326,5 +9344,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
@@ -9332,5 +9350,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
@@ -9338,6 +9356,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
@@ -9351,32 +9369,37 @@
 msgstr "パース中にエラーが発生しています"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "ファイル \"{0}\" はありません"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
@@ -9388,5 +9411,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
@@ -9405,8 +9428,8 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
+msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "id=0の禁じられたオブジェクトです"
 
@@ -9415,26 +9438,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr "ID {0} のOSM プリミティブの ''version'' 属性に不正な値。入力値: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9442,10 +9454,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません"
 
@@ -9457,5 +9469,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
@@ -9463,5 +9475,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9469,6 +9481,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9476,5 +9488,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
@@ -9484,8 +9496,6 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
-msgstr ""
-"外部ID ''{0}'' のリレーションが外部ID ''{1}'' の存在しないプリミティブを参照"
-"しています"
+"id ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
@@ -9503,11 +9513,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr "パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -9521,23 +9526,23 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "変更セットを読み込んでいます..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "変更セットをダウンロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "変更セット {0} を読み込んでいます ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "変更セット {0} をダウンロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
 
@@ -9552,18 +9557,18 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "API {0} への接続に失敗しました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
 msgid "Error: failed to add authentication credentials to the connection."
-msgstr ""
+msgstr "エラー: 接続する認証信任状の追加に失敗。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9573,5 +9578,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9581,5 +9586,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9591,10 +9596,10 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), 残り {3} 。ノード ''{4}'' をアップロード中(ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), 残り {3} 。ウェイ ''{4}'' をアップロード中(ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
@@ -9602,4 +9607,5 @@
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
+"{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
@@ -9616,9 +9622,11 @@
 "0.6"
 msgstr ""
+"警告: アップロードするデータにAPIバージョンが定義されていません。バージョン"
+"0.6 にフォールバックします。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9743,5 +9751,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
@@ -10010,5 +10018,5 @@
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。<br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
@@ -10018,9 +10026,12 @@
 "community."
 msgstr ""
+"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>"
+"もっと小さいエリアでリクエストするか、OSM コミュニティから提供されたエクス"
+"ポートファイルを使用してください。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
+msgstr "<br>エラーメッセージ(未訳): {0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
@@ -10045,5 +10056,5 @@
 "ブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10121,5 +10132,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10128,5 +10139,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10135,5 +10146,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10142,5 +10153,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10149,5 +10160,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10207,13 +10218,13 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
-msgstr ""
+msgstr "表示"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
-msgstr ""
+msgstr "自分のトレースを他のOSM ユーザに表示するかどうか定義します。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
@@ -10289,4 +10300,133 @@
 msgstr "openstreetmap.org へトレースをアップロード"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "アドレスの補完"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr "ハンディアドレス補間機能"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr "アドレス補間を定義"
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "奇数"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "偶数"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr "リレーション: {0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr "ナンバリングスキーム:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr "開始番号:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr "終了番号:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr "オプション情報"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr "国コードは2文字でなければなりません"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr "開始および終了アドレスに正しい値を入力してください"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr "アルファベットのアドレスは文字で終了しなければなりません"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr "開始アドレス文字は終了アドレス文字よりも小さくなければなりません"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr "開始アドレスに正しい数字を入力してください"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr "終了アドレスに正しい数字を入力してください"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません"
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10405,4 +10545,9 @@
 msgid "Error while parsing {0}"
 msgstr "{0}の解析中にエラー"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "\"{0}\"を読み込めません。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10702,13 +10847,13 @@
 msgstr "選択..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10717,13 +10862,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "変更が実施されるようにJOSM を停止しました"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11082,28 +11227,28 @@
 msgstr "ブランクのレイヤー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMSレイヤー ({0}), {1}このタイル読み込み"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "ラスターサイズ: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "ベクタライズされました。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11112,14 +11257,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "キャッシュフォーマットエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "ランベルトゾーンキャッシュエラー"
@@ -12516,13 +12661,4 @@
 msgstr "テラスハウス"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "偶数"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "奇数"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12547,41 +12683,4 @@
 msgstr "オプション"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "ユーザ"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "作者パネルを表示"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "ユーザページを開く"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "ブラウザでユーザページを開く"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "ユーザのデータを選択"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "ユーザデータを選択したものに置き替えます。"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "データを選択してください"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "著作者パネルを使用してユーザを選んでください。"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "申し訳ありません。匿名のユーザでは利用できません。"
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
@@ -12647,4 +12746,6 @@
 "verify no errors have been introduced."
 msgstr ""
+"ウェイの中に、修正されたリレーションに含まれるものがあります。エラーが出ない"
+"ことを確認してください。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
@@ -12751,10 +12852,10 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12836,12 +12937,30 @@
 msgstr "その他を検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr "テスト {0} 実行中"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "妥当性検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "データの妥当性を検証"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr "検証中"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr "テスト {0}/{1}:  {2} 開始"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr "無視されたエラーを更新中 ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12911,21 +13030,21 @@
 msgstr "\"{0}\" を \"{1}\" で置き換える。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "このテストは海岸線が正しいことをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "順序付いていない海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "交差するウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12933,35 +13052,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "同位置のノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "重複したウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12969,5 +13088,5 @@
 msgstr "このテストは同じタグで同じノード座標が無いことをチェックしています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "重複したウェイを削除"
@@ -12985,18 +13104,18 @@
 msgstr "ウェイのノードの複製"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "同じ名前のノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "このテストは同じ名前のノードを探します（重複の可能性）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "重なったウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13006,29 +13125,29 @@
 "チェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "重なった領域"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "道路の重なり(エリアも含む)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "鉄道の重なり(エリアも含む)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "ウェイの重なり(エリアも含む)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "重なった道路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "重なった鉄路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "重なったウェイ"
@@ -13044,33 +13163,33 @@
 msgstr "このテストはノードのいくつかを一回以上含むウェイをチェックしています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "同じような名前のウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "プロパティチェッカー："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13081,7 +13200,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -13089,80 +13208,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13170,130 +13289,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "不正な正規表現： \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "これは循環しているべきウェイが閉じられているかチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "自然のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "土地利用のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "アメニティのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "スポーツのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "旅行関係のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "店のタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "レジャーのタイプ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13389,5 +13508,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13403,18 +13522,18 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "領域"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "つながっていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13422,76 +13541,76 @@
 "クしています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "ウエイは他の高速道路の近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "ほかのウェイに近いウェイのノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "タグ付けされておらず、かつつながっていないノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "タグ付けされておらず、空で一ノードのウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "名前のないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "名前の無いジャンクション"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "タグ付いていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "空のウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "ノードが一つのウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "順序の誤ったウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "海岸線の反転: 陸地が左側にありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "水域の反転： 陸地は左側にない"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "陸地の反転：　陸地は左側にない"
@@ -13886,6 +14005,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13896,10 +14020,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13911,10 +14035,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13922,5 +14046,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -13928,5 +14052,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13937,10 +14061,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13951,20 +14075,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "ルーティング情報をルーティンググラフとして可視化する。"
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "地図グリッドを表示する背景レイヤーを提供します。"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13974,10 +14098,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13985,5 +14109,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13995,10 +14119,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14008,10 +14132,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -14020,5 +14144,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14026,5 +14150,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14034,5 +14158,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14043,15 +14167,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14060,10 +14184,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14072,15 +14196,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14090,14 +14214,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "一つのブロックからテラスハウスを作成する"
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
 
 #. Plugin utilsplugin
@@ -19074,4 +19191,24 @@
 msgstr "スタジアム"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19827,10 +19964,4 @@
 msgid "Country code"
 msgstr "国コード"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "住所の補間"
 
 #. item
@@ -25996,10 +26127,10 @@
 msgstr "チェコ UHUL:ORTOFOTO"
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
-
 #~ msgid "Move"
 #~ msgstr "移動"
 
+#~ msgid "No data imported."
+#~ msgstr "データーはインポートされませんでした。"
+
 #~ msgid "Data Layer"
 #~ msgstr "データレイヤー"
@@ -26025,4 +26156,7 @@
 #~ msgid "Aborting..."
 #~ msgstr "中止します..."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "保存されていない変更"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -26151,4 +26285,22 @@
 #~ msgid "Public"
 #~ msgstr "公開"
+
+#~ msgid "User"
+#~ msgstr "ユーザ"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "作者パネルを表示"
+
+#~ msgid "Open User Page"
+#~ msgstr "ユーザページを開く"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "ブラウザでユーザページを開く"
+
+#~ msgid "Select User's Data"
+#~ msgstr "ユーザのデータを選択"
+
+#~ msgid "Please select some data"
+#~ msgstr "データを選択してください"
 
 #~ msgid "Navigation"
@@ -26391,21 +26543,15 @@
 #~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
 
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
-#~ "あなたの母国語</A>でそれを作成してください。"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- 起動中のバージョンは {0} です。"
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。"
 
 #~ msgid "Invalid projection"
 #~ msgstr "投影法が無効"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "ユーザデータを選択したものに置き替えます。"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "著作者パネルを使用してユーザを選んでください。"
 
 #~ msgid "Continue anyway"
@@ -26483,4 +26629,11 @@
 #~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
+
 #~ msgid "There is currently no changeset open."
 #~ msgstr "現在開かれている変更セットはありません。"
@@ -26544,4 +26697,7 @@
 #~ msgstr "未決定です"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
+
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr ""
@@ -26554,4 +26710,7 @@
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
+
+#~ msgid "Missing mandatory attribute ''{0}''"
+#~ msgstr "必要な属性 ''{0}'' がありません"
 
 #~ msgid ""
@@ -26561,2 +26720,14 @@
 #~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
 #~ "見つかりません。"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
+#~ "い。"
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
+#~ "あなたの母国語</A>でそれを作成してください。"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-08-15 13:39+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Feil"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Ulagrede endringer"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Lagre og avslutt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Forkast og avslutt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Overser feilutformet URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Overser feilutformet fil-URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr "Flett"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,44 +536,4 @@
 msgid "Please select at least three nodes."
 msgstr "Velg minst 3 noder"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
-"er {0}, maksimalt er {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "API-krav ikke møtt"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt tillatt "
-"lengde {2}. Verdiens lengde er {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Forhåndsbetingelse brutt"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -659,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -771,5 +714,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -785,5 +728,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -833,8 +776,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1005,5 +950,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameter «{0}» må ha en verdi"
 
@@ -1011,5 +956,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1041,5 +986,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Endre"
@@ -1724,14 +1669,14 @@
 msgstr "Utvalget er tomt"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Last opp til OSM …"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Last opp alle endringer til OSM-tjeneren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1740,23 +1685,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Ingen endringer å laste opp. Finn frem data først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Ingen endringer å laste opp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkroniser kun {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synkroniser hele datasettet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1777,17 +1722,17 @@
 "strong> for å gå tilbake og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Konflikt oppdaget"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "Uventet returverdi. Mottok {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1802,39 +1747,40 @@
 "strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Klarte ikke laste opp til OSM-API"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Oppdaterer objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1946,8 +1892,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Ingenting er importert."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2493,4 +2435,68 @@
 msgstr "Feil ved tjenerkommunikasjon."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Gjeldende antall endringer overstiger maksimalt antall endringer: gjeldende "
+"er {0}, maksimalt er {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API-krav ikke møtt"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt tillatt "
+"lengde {2}. Verdiens lengde er {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Forhåndsbetingelse brutt"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2592,6 +2598,6 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr "allerede registrert en konflikt for primitiv \"{0}\""
 
@@ -2618,5 +2624,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "kan ikke løse uavgjort konflikt"
 
@@ -2672,5 +2678,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Splitt linje i segment"
@@ -2678,6 +2684,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2689,5 +2695,5 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2795,7 +2801,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Løs nodekonflikter i vei {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2965,5 +2971,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "allerede registrert en konflikt for primitiv \"{0}\""
 
@@ -2982,18 +2988,21 @@
 msgstr "Grader, minutter, sekunder"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "Ø"
@@ -3007,41 +3016,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 nødvendig. Leste {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3059,29 +3090,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
@@ -3091,33 +3123,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "Fant ingen siste versjon. Historikken er tom."
 
@@ -3130,12 +3163,6 @@
 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/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
 
@@ -3143,5 +3170,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
@@ -3294,5 +3321,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3303,5 +3330,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3312,5 +3339,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3798,5 +3825,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
@@ -3860,5 +3887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
 
@@ -3962,5 +3989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
@@ -3968,15 +3995,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "Uventet verdi for parameter «index». Leste {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "fant ikke {0} i liste"
 
@@ -4036,5 +4063,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopier valgte lokale elementer til slutten av lista over sammenslåtte "
@@ -4044,5 +4071,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopier valgte lokale elementer til plassen før første valgte element i lista "
@@ -4052,5 +4079,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopier valgte lokale elementer til plassen etter første valgte element i "
@@ -4058,5 +4085,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Kopier valgte elementer på tjeneren til starten av lista over sammenslåtte "
@@ -4064,5 +4092,5 @@
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
@@ -4072,5 +4100,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Kopier valgte elementer på tjeneren til plassen før første valgte element i "
@@ -4091,5 +4119,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Flytt valgte elementer opp én plass"
 
@@ -4100,5 +4128,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Flytt valgte elementer ned én plass"
 
@@ -4113,5 +4141,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
 
@@ -4123,5 +4151,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Lås gjeldende liste over sammenslåtte elementer"
 
@@ -4131,5 +4159,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing"
 
@@ -4137,5 +4165,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
@@ -4145,5 +4174,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4176,15 +4205,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"Justering {0} er ikke registrert ennå. Kan ikke sette deltakelse i "
-"synkronisert justering."
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "Justering {0} er ikke regitrert ennå."
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4193,5 +4220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
@@ -4199,5 +4226,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "Uventet kolonneindeks: {0}"
 
@@ -4402,5 +4429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
@@ -4461,5 +4488,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
 
@@ -4467,5 +4494,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
@@ -4575,14 +4602,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4591,7 +4618,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4656,5 +4681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4677,4 +4702,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4830,5 +4860,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4886,5 +4916,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "Indeks er utenfor rekkevidde: {0}"
 
@@ -4922,5 +4952,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Vis historikken for det valgte objektet"
 
@@ -4990,5 +5020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<different>"
@@ -5214,6 +5244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5265,5 +5294,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5489,4 +5517,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5520,6 +5552,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5788,5 +5825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
@@ -5794,10 +5831,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
@@ -5805,10 +5844,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+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:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 "Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
@@ -5818,9 +5859,4 @@
 msgid "Load history"
 msgstr "Last historikk"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6932,4 +6968,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Forkast og avslutt"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6943,4 +6983,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Lagre og avslutt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7161,6 +7205,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7276,36 +7323,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Bruk globale indstillinger."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7313,5 +7360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7320,5 +7367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7353,4 +7400,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7409,5 +7457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
@@ -7422,5 +7470,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7428,5 +7476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7534,5 +7582,5 @@
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7540,28 +7588,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "GPS spor"
-msgstr[1] "GPS spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7569,5 +7601,5 @@
 msgstr[1] "punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7576,5 +7608,5 @@
 msgstr[1] "et GPS spor med {0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7583,5 +7615,5 @@
 msgstr[1] "{0} består av {1} GPS spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7715,5 +7747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Velg raden som skal endres"
@@ -7729,5 +7761,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7907,4 +7939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8457,5 +8490,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Slett den valgte kilden fra lista."
@@ -8662,33 +8695,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Bruk objektmal «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "stengt_vei"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8699,15 +8733,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8717,18 +8751,18 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Endre egenskaper"
@@ -8758,10 +8792,4 @@
 msgstr "Laster ned punkt {0} til {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8775,11 +8803,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Klarte ikke lese «{0}»"
 
@@ -8798,5 +8825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "beskrivelse av sporloggen"
 
@@ -8860,5 +8887,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8871,5 +8897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
 
@@ -8881,5 +8907,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
@@ -8932,5 +8958,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert "
@@ -8972,5 +8998,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API."
 
@@ -8989,5 +9015,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}"
 
@@ -8995,5 +9021,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
 
@@ -9001,5 +9027,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
@@ -9011,10 +9037,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9033,5 +9053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Ingen base med rettinger tilstede for opplasting"
 
@@ -9063,20 +9083,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9089,5 +9104,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Tjeneren svarte en feil med kode {0}"
 
@@ -9104,7 +9119,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "obligatorisk attributt «{0}» mangler"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9114,15 +9135,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9130,11 +9151,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9153,5 +9168,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9234,5 +9249,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9240,5 +9255,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9254,15 +9269,8 @@
 msgstr "OSM-tjenerfiler gzip-komprimert"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "obligatorisk attributt «{0}» mangler"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
@@ -9271,5 +9279,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – leste "
@@ -9278,5 +9287,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
@@ -9285,5 +9294,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
@@ -9293,5 +9302,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste «{1}»"
@@ -9300,6 +9309,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
@@ -9314,32 +9323,37 @@
 msgstr "Feil ved innlesing."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Fila «{0}» finnes ikke"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9351,5 +9365,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9370,5 +9384,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Ulovlig objekt med id=0"
 
@@ -9377,26 +9391,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9404,10 +9407,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9419,5 +9422,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9425,5 +9428,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9431,6 +9434,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9438,5 +9441,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9445,5 +9448,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9462,10 +9465,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9498,5 +9496,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
 
@@ -9511,5 +9509,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Klarte ikke åpne tilkobling til API {0}"
 
@@ -9520,10 +9518,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9533,5 +9531,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9541,5 +9539,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9580,5 +9578,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9987,5 +9985,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10057,5 +10055,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10064,5 +10062,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10071,5 +10069,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10078,5 +10076,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10085,5 +10083,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10225,4 +10223,133 @@
 msgstr "Last opp spor til openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpoler adresser"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Oddetall"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Heltall"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10341,4 +10468,9 @@
 msgid "Error while parsing {0}"
 msgstr "Feil oppsto ved sending av {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Klarte ikke lese «{0}»"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10632,13 +10764,13 @@
 msgstr "Velg fra …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10651,13 +10783,13 @@
 "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11027,28 +11159,28 @@
 msgstr "Blankt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Er vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11059,9 +11191,9 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11069,5 +11201,5 @@
 "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
@@ -12468,13 +12600,4 @@
 msgstr "Terasse"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Heltall"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Oddetall"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12498,41 +12621,4 @@
 msgid "Optional"
 msgstr "Tillegg"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Bruker"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Vis Opphavsmenn Panel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Åpne brukerside"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Åpne brukerside i utforsker"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Velg brukers data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Bytt ut utvalg med brukers data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Velg data først"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Velg en bruker fra panel med opphavsmenn"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Beklager. Anonyme brukere får ikke lov til dette."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12708,10 +12794,10 @@
 msgstr "Ingen valideringsfeil"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Rutenett"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12793,12 +12879,30 @@
 msgstr "gyldighetssjekk – annet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Kjører datavalidering"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12868,21 +12972,21 @@
 msgstr "Erstatt «{0}» med «{1}» for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Kystlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Denne testen sjekker om kystlinjene er korrekte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Kystlinje i uorden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Kryssende linjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12890,35 +12994,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Kryssende veier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dobbelt-Noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12926,5 +13030,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12942,18 +13046,18 @@
 msgstr "Doble linjenoder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Noder med samme navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Denne testen finner Noder som har samme navn (kan være dubletter)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Overlappende linjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12963,29 +13067,29 @@
 "enn én linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Overlappende områder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Overlappende ferdselsveier (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Overlappende jernbaner (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Overlappende linjer (med område)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Overlappende ferdselsveier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Overlappende jernbaner"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Overlappende linjer"
@@ -13001,33 +13105,33 @@
 msgstr "Denne testen sjekker om noder går igjen flere ganger i en linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Linjer med like navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Egenskapskontroll"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ugyldig stavekontroll linje: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13038,7 +13142,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ulovlige kombinasjoner Egenskap / Verdi"
@@ -13046,80 +13150,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problem med visning"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nøkkel «{0}» er ugyldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Egenskaper uten verdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ulovlig egenskapsnøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Ulovlig mellomrom i Nøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Egenskap Verdi inneholder HTML koding"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Objektmalene inneholder ikke Nøkkelen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Objektmalen har ikke Egenskapsverdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Sjekk egenskabsnøkler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Bruk avansert egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Egenskapskontroll-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13129,130 +13233,130 @@
 "org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Sjekk egenskapsverdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Se etter FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Finn notater om tegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Bruk standard datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Bruk standard datafil (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Bruk standard fil for stavekontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Korriger egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Kunne ikke finne element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Kunne ikke finne advarsels-niveå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ugyldig uttrykk «{0}»"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ugyldig regulært uttrykk «{0}»"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Ikke lukkede linjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Kontrollerer om sirkulære linjer er lukket."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "natur-type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "Type Bruk av Grunn {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "fasilitetstype {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "sport type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turisme type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "butikk type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "fritids type {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13348,5 +13452,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13362,91 +13466,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "område"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Ikke lukket linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Ikke knyttede linjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "Sluttnode nær annen ferdselsvei"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "Sluttnode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Linjenode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Knyttet endenode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Noder uten egenskaper eller tilknytninger"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Linjer med én node, tomme eller uten egenskaper."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Finner linjer med én node, som er tomme eller er uten egenskaper."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Linjer uten navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Kryss uten navn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Linjer uten egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Tomme linjer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Linjer med bare én node"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Linjer med feil retning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Testen finner linjer som elver, land eller kystlinje med feil retning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Feil retning på Landlinje: Land er ikke på venstre side"
@@ -13861,6 +13965,11 @@
 msgstr "Dine redigeringer må være offentlig frigitt for å laste opp nye data"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13871,10 +13980,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "En spesiell håntering for det franske landregisterets WMS tjener"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13890,10 +13999,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13901,10 +14010,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13915,10 +14024,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Dupliser linjer med parallell avstand"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13928,20 +14037,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Bakgrunnslag som viser rutenettet i kartet"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13954,10 +14063,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13967,5 +14076,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13978,10 +14087,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13994,15 +14103,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14010,5 +14119,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14016,5 +14125,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14025,15 +14134,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14044,10 +14153,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14058,15 +14167,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14079,16 +14188,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
-"bruker, åpner brukerprofil i nettleser."
 
 #. Plugin utilsplugin
@@ -19064,4 +19164,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19816,10 +19936,4 @@
 msgid "Country code"
 msgstr "Landskode"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpoler adresser"
 
 #. item
@@ -25985,10 +26099,10 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter «{0}» må ha en verdi"
-
 #~ msgid "Move"
 #~ msgstr "Flytt"
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Ulagrede endringer"
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Noen av nodene er (nesten) på linje"
@@ -25996,14 +26110,4 @@
 #~ msgid "Email"
 #~ msgstr "E-post"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
 
 #~ msgid ""
@@ -26053,4 +26157,7 @@
 #~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?"
 
+#~ msgid "No data imported."
+#~ msgstr "Ingenting er importert."
+
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Følgende feil oppsto under nedlasting:"
@@ -26154,4 +26261,7 @@
 #~ msgid "Authors: {0}"
 #~ msgstr "Opphavsmenn: {0}"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Vis Opphavsmenn Panel"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -26294,6 +26404,30 @@
 #~ msgstr "Importer TCX fil som GPS spor"
 
+#~ msgid "User"
+#~ msgstr "Bruker"
+
+#~ msgid "Open User Page"
+#~ msgstr "Åpne brukerside"
+
 #~ msgid "Continue anyway"
 #~ msgstr "Fortsett uansett"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Beklager. Anonyme brukere får ikke lov til dette."
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Bytt ut utvalg med brukers data"
+
+#~ msgid "Please select some data"
+#~ msgstr "Velg data først"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Åpne brukerside i utforsker"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Velg brukers data"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Velg en bruker fra panel med opphavsmenn"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -26442,7 +26576,4 @@
 #~ msgstr "linjer"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- aktive versjon er {0}"
-
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Kontakter OSM-tjeneren …"
@@ -26488,4 +26619,11 @@
 #~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
 #~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
+
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
+#~ "bruker, åpner brukerprofil i nettleser."
 
 #~ msgid "Edit Information Office"
@@ -26532,4 +26670,7 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parameter «{0}» må ha en verdi"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Bruk ufullstendige løsninger"
@@ -26555,2 +26696,12 @@
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Fjern relasjonsmedlem {0} {1}"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
+#~ "\"{1}\">norsk bokmål</A>."
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:14+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:03+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Fout"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Niet-opgeslagen wijzigingen"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Sla op en verlaat JOSM"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Negeer veranderingen en verlaat JOSM"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ongeldige URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Waarschuwing"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ongeldige bestands-URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Annuleren"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,43 +536,4 @@
 msgid "Please select at least three nodes."
 msgstr "Selecteer minstens drie knopen:"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Lengte van de waarde voor label \"{0}\" van onderdeel {1} overschrijdt de "
-"maximumwaarde {2}. De lengte is nu {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -658,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -774,5 +718,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -788,5 +732,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -836,8 +780,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1008,5 +954,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "Parameter \"{0}\" mag niet leeg zijn."
 
@@ -1014,5 +960,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1044,5 +990,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Bewerken"
@@ -1741,14 +1687,14 @@
 msgstr "Selectie leeg"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Naar OSM uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Upload alle aanpassingen naar de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1757,23 +1703,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchroniseer alleen {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchroniseer alle gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1787,17 +1733,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Tegenstrijdigheid ontdekt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1808,39 +1754,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1952,8 +1899,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Geen gegevens geïmporteerd."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2490,4 +2433,67 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Lengte van de waarde voor label \"{0}\" van onderdeel {1} overschrijdt de "
+"maximumwaarde {2}. De lengte is nu {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2589,6 +2595,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2613,5 +2619,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2667,5 +2673,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Wegsegment splitsen"
@@ -2673,6 +2679,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2684,5 +2690,5 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2788,7 +2794,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Conflicten in verwijderde toestand oplossen in {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2959,5 +2965,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2976,18 +2982,21 @@
 msgstr "Graden minuten seconden"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "O"
@@ -3001,41 +3010,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3053,29 +3084,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3085,33 +3117,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3124,12 +3157,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3137,5 +3164,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3285,5 +3312,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3294,5 +3321,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3303,5 +3330,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3794,5 +3821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "laag niet in lijst."
 
@@ -3858,5 +3885,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3956,5 +3983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3962,15 +3989,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -4026,5 +4053,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4032,5 +4059,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4038,13 +4065,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4052,5 +4080,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4067,5 +4095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Geselecteerde elementen één positie omhoog schuiven"
 
@@ -4076,5 +4104,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4089,5 +4117,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4099,5 +4127,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4107,5 +4135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4113,5 +4141,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4119,5 +4148,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4148,6 +4177,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4155,5 +4184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4163,5 +4192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4169,5 +4198,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4362,5 +4391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4421,5 +4450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4427,5 +4456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4535,14 +4564,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4551,7 +4580,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4616,5 +4643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4637,4 +4664,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4794,5 +4826,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4850,5 +4882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4886,5 +4918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4954,5 +4986,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<verschillend>"
@@ -5180,6 +5212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5231,5 +5262,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5455,4 +5485,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5486,5 +5520,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5755,5 +5794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5761,28 +5800,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6895,4 +6933,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Negeer veranderingen en verlaat JOSM"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6906,4 +6948,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Sla op en verlaat JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7124,6 +7170,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7239,36 +7288,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "GPS-punt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7276,5 +7325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7283,5 +7332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7316,4 +7365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7372,5 +7422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
@@ -7385,5 +7435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7391,5 +7441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7497,5 +7547,5 @@
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7503,28 +7553,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "track"
-msgstr[1] "tracks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7532,5 +7566,5 @@
 msgstr[1] "Punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7539,5 +7573,5 @@
 msgstr[1] "Een track met {0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7546,5 +7580,5 @@
 msgstr[1] "{0} bestaat uit {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7678,5 +7712,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Selecteer een rij om te bewerken."
@@ -7692,5 +7726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7875,4 +7909,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8431,5 +8466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "De geselecteerde bron uit de lijst verwijderen."
@@ -8642,33 +8677,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Voorkeuze ''{0}'' gebruiken"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "afgesloten weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8679,15 +8715,15 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementen van type {0} worden ondersteund."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8697,18 +8733,18 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Eigenschappen veranderen"
@@ -8738,10 +8774,4 @@
 msgstr "Downloaden van punten {0} tot {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8755,11 +8785,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Kan \"{0}\" niet lezen"
 
@@ -8778,5 +8807,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "GPS-trackomschrijving"
 
@@ -8840,5 +8869,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8851,5 +8879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
 
@@ -8861,5 +8889,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8911,5 +8939,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8949,5 +8977,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8965,5 +8993,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8971,5 +8999,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8977,5 +9005,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8987,10 +9015,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9009,5 +9031,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -9039,20 +9061,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9065,5 +9082,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9080,6 +9097,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9090,15 +9113,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9106,11 +9129,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9129,5 +9146,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9206,5 +9223,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9212,5 +9229,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9226,15 +9243,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9242,10 +9252,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9253,5 +9264,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9259,5 +9270,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9265,6 +9276,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9277,32 +9288,37 @@
 msgstr "Fout tijdens ontleden."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9314,5 +9330,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9333,5 +9349,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Ongeldig object met id=0"
 
@@ -9340,26 +9356,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9367,10 +9372,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9382,5 +9387,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9388,5 +9393,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9394,6 +9399,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9401,5 +9406,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9408,5 +9413,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9425,10 +9430,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9461,5 +9461,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9474,5 +9474,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9483,10 +9483,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9496,5 +9496,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9504,5 +9504,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9543,5 +9543,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9945,5 +9945,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10015,5 +10015,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10022,5 +10022,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10029,5 +10029,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10036,5 +10036,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10043,5 +10043,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10181,4 +10181,133 @@
 msgstr "Sporen naar openstreetmap.org uploaden"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Adresinterpolatie"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Oneven"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Even"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10297,4 +10426,9 @@
 msgid "Error while parsing {0}"
 msgstr "Fout tijdens ontleden {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kan \"{0}\" niet lezen"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10588,13 +10722,13 @@
 msgstr "Kies uit..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10603,13 +10737,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10980,28 +11114,28 @@
 msgstr "Lege laag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Is niet gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Is gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11012,14 +11146,14 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Fout in buffer Lambert-zone"
@@ -12416,13 +12550,4 @@
 msgstr "Terras"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Even"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Oneven"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12446,41 +12571,4 @@
 msgid "Optional"
 msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Gebruiker"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Auteurspaneel tonen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Gebruikerspagina openen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Gebruikerspagina in browser openen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Gebruikers' gegevens selecteren"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Selectie vervangen door gegevens gebruiker"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Enkele gegevens selecteren a.u.b."
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Via het auteurspaneel een gebruiker kiezen"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Helaas, werkt niet voor anonieme gebruikers"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12663,10 +12751,10 @@
 msgstr "Geen validatiefouten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Raster"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12748,12 +12836,30 @@
 msgstr "Validatie andere"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validatie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Gegevensvalidatie uitvoeren"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12823,21 +12929,21 @@
 msgstr "Vervang \"{0}\" door \"{1}\" voor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Kustlijnen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Deze test controleert of kustlijnen correct zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Ongeordende kustlijn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Kruisende wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12845,36 +12951,36 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Kruisende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12882,5 +12988,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12898,18 +13004,18 @@
 msgstr "Dubbele wegknopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Knopen met dezelfde naam"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Deze test zoekt knopen met dezelfde naam (kunnen dubbele zijn)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Overlappende wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12919,29 +13025,29 @@
 "wordt door meer dan één weg."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Overlappende gebieden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Overlappende snelwegen (met oppervlak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Overlappende spoorwegen (met oppervlak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Overlappende wegen (met oppervlak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Overlappende snelwegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Overlappende spoorwegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Overlappende wegen"
@@ -12959,10 +13065,10 @@
 "bevatten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Gelijkgenaamde wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -12971,24 +13077,24 @@
 "gespeld zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Eigenschapchecker:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Deze plugin controleert op fouten in sleutels en waarden van eigenschappen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ongeldige regel tagchecker - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ongeldige regel spellingschecker: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12999,7 +13105,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ongeldige tag/waarde-combinaties"
@@ -13007,81 +13113,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Tekenprobleem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Toets ''{0}'' is ongeldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Tags met lege waarden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ongeldige eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Ongeldige spatie in eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Eigenschapwaarden bevatten HTML-codes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, 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:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "Herstel-mij's"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Eigenschapsleutels controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Uitgebreide eigenschapchecker gebruiken"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Tagcheckerbron"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13092,130 +13198,130 @@
 "tagchecker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Gegevensbronnen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Eigenschapwaarden controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Controleer op herstel-mij's."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Controleer op tekenknopen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Standaardgegevensbestand gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Standaardbestand spellingscontrole gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Eigenschappen herstellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Kan elementsoort niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Kan waarschuwingsniveau niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ongeldige expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ongeldige reguliere expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Niet-gesloten wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Dit test of circulaire wegen gesloten zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "soort natuur {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "soort landgebruik {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "soort voorziening {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "soort sport {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "soort toerisme {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "soort winkel {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "soort vermaak {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13311,5 +13417,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13325,18 +13431,18 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "gebied"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Niet-gesloten weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Niet-verbonden wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13344,26 +13450,26 @@
 "heeft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "Wegeindknoop dicht bij andere snelweg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Wegknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg verbonden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Ongetagde en niet-verbonden knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13371,49 +13477,49 @@
 "weg."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Ongetagde, lege en éénknoopswegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Dit test op wegen zonder tag, die leeg zijn of één knoop bevatten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Onbenoemde wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Ongetagde wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Lege wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Éénknoopswegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Verkeerd geordende wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "De test controleer de richting van water-, land of kustlijnwegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Omgekeerde land: land niet aan linker zijde"
@@ -13808,6 +13914,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13816,10 +13927,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13831,10 +13942,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13842,10 +13953,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13854,10 +13965,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13866,20 +13977,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13889,10 +14000,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13900,5 +14011,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13908,10 +14019,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13921,15 +14032,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13937,5 +14048,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13943,5 +14054,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13950,15 +14061,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13967,10 +14078,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13979,15 +14090,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13997,13 +14108,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18976,4 +19080,24 @@
 msgstr "Stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19728,10 +19852,4 @@
 msgid "Country code"
 msgstr "Landcode"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Adresinterpolatie"
 
 #. item
@@ -25897,7 +26015,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' mag niet leeg zijn"
-
 #~ msgid "Unknown version"
 #~ msgstr "Onbekende versie"
@@ -25959,4 +26074,7 @@
 #~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
 #~ "gegevens naar de server."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niet-opgeslagen wijzigingen"
 
 #~ msgid "Contacting the OSM server..."
@@ -26203,4 +26321,31 @@
 #~ msgstr "Kan voorkeurenmap niet openen: {0}"
 
+#~ msgid "User"
+#~ msgstr "Gebruiker"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Auteurspaneel tonen"
+
+#~ msgid "Open User Page"
+#~ msgstr "Gebruikerspagina openen"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Gebruikerspagina in browser openen"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Gebruikers' gegevens selecteren"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Selectie vervangen door gegevens gebruiker"
+
+#~ msgid "Please select some data"
+#~ msgstr "Enkele gegevens selecteren a.u.b."
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Via het auteurspaneel een gebruiker kiezen"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Helaas, werkt niet voor anonieme gebruikers"
+
 #~ msgid "viaduct"
 #~ msgstr "viaduct"
@@ -26233,4 +26378,7 @@
 #~ msgid "Email"
 #~ msgstr "E-mail"
+
+#~ msgid "No data imported."
+#~ msgstr "Geen gegevens geïmporteerd."
 
 #~ msgid "Data Layer"
@@ -26396,10 +26544,4 @@
 #~ msgstr "Valhek bewerken"
 
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- uitgevoerde versie is {0}"
-
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -26417,4 +26559,10 @@
 #~ "Upload geen gegevens na dit bericht."
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parameter '{0}' mag niet leeg zijn"
+
 #~ msgid "No data"
 #~ msgstr "Geen gegevens"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:32+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\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-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -23,5 +23,5 @@
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -29,5 +29,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -36,14 +36,14 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projekcja {0} nie może zostać aktywowana. Używam Mercatora."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -80,6 +80,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -94,4 +94,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -107,6 +112,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -114,83 +119,11 @@
 msgstr "Błąd"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
-msgstr[1] "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-msgstr[2] "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Niezapisane zmiany"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Zapisz i wyjdź"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Porzuć i wyjdź"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -212,7 +145,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -226,5 +159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -251,13 +184,13 @@
 msgstr "Uwaga"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -398,4 +331,52 @@
 msgid "Merge"
 msgstr "Połącz"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Anuluj"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -491,4 +472,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -503,5 +485,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -538,6 +520,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -559,41 +541,4 @@
 msgid "Please select at least three nodes."
 msgstr "Wybierz co najmniej trzy węzły."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość "
-"zmian to {0} z możliwych {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Naruszenie możliwości API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -662,5 +607,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -776,5 +721,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -790,5 +735,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -840,8 +785,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1012,5 +959,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameter ''{0}'' nie może być pusty (null)"
 
@@ -1018,5 +965,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1048,5 +995,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Edycja"
@@ -1741,14 +1688,14 @@
 msgstr "Wybrano zbiór pusty."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Wyślij do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Wysyła wszystkie zmiany na serwer OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1757,23 +1704,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Brak zmian do wysłania."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchronizuj cały zestaw danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1787,17 +1734,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Wykryto konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "niespodziewana wartość powrotna. Dostałem {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1808,39 +1755,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Załadunek do API OSM się nie udał."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1952,8 +1900,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Nie zaimportowano danych."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2481,4 +2425,65 @@
 msgid "Error while communicating with server."
 msgstr "Błąd podczas łączenia z serwerem."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość "
+"zmian to {0} z możliwych {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Naruszenie możliwości API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2582,6 +2587,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2606,5 +2611,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2660,5 +2665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Rozdziel segmenty drogi"
@@ -2666,6 +2671,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2677,5 +2682,5 @@
 "węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Potwierdź usunięcie."
@@ -2951,5 +2956,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2968,18 +2973,21 @@
 msgstr "Stopnie minuty sekundy"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "E"
@@ -2993,41 +3001,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3045,29 +3075,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3077,33 +3108,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3116,12 +3148,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3129,5 +3155,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3277,5 +3303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3287,5 +3313,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3297,5 +3323,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3773,5 +3799,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "warstwa nie jest na liście."
 
@@ -3834,5 +3860,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3932,5 +3958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3938,15 +3964,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -4002,5 +4028,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4008,5 +4034,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4014,13 +4040,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4028,5 +4055,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4043,5 +4070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4052,5 +4079,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4065,5 +4092,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4075,5 +4102,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4083,5 +4110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4089,5 +4116,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4095,5 +4123,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4124,6 +4152,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4131,5 +4159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4139,5 +4167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4145,5 +4173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4338,5 +4366,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4397,5 +4425,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4403,5 +4431,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4511,14 +4539,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4527,7 +4555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4594,5 +4620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4615,4 +4641,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4768,5 +4799,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4824,5 +4855,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4860,5 +4891,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4929,5 +4960,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<różne>"
@@ -5155,6 +5186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5206,5 +5236,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5430,4 +5459,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5461,5 +5494,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5729,5 +5767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5735,28 +5773,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6869,4 +6906,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Porzuć i wyjdź"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6880,4 +6921,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Zapisz i wyjdź"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7098,6 +7143,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7214,36 +7262,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punkt GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7251,5 +7299,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7258,5 +7306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7291,4 +7339,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7349,5 +7398,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
@@ -7362,5 +7411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7368,5 +7417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7472,5 +7521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7478,29 +7527,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "trasa"
-msgstr[1] "trasy"
-msgstr[2] "tras"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7509,5 +7541,5 @@
 msgstr[2] "punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7517,5 +7549,5 @@
 msgstr[2] "trasa z {0} punktami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7525,5 +7557,5 @@
 msgstr[2] "{0} składa się z {1} ścieżek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7656,5 +7688,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Proszę wybrać wiersz do edycji"
@@ -7670,5 +7702,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7836,4 +7868,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8384,5 +8417,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -8569,33 +8602,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Więcej informacji na temat tej funkcji"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Dodatkowe atrybuty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Używa szablon \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "zamknięta droga"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8606,15 +8640,15 @@
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu {0} nie są wspierane."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8625,18 +8659,18 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Zmień właściwości"
@@ -8666,10 +8700,4 @@
 msgstr "Pobieranie punktów od {0} do {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8684,11 +8712,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Nie można odczytać \"{0}\""
 
@@ -8707,5 +8734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Opis trasy GPS"
 
@@ -8769,5 +8796,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8780,5 +8806,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
 
@@ -8790,5 +8816,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8840,5 +8866,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8878,5 +8904,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8894,5 +8920,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8900,5 +8926,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8906,5 +8932,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8916,10 +8942,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8938,5 +8958,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8968,20 +8988,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8994,5 +9009,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9009,6 +9024,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9019,15 +9040,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9035,11 +9056,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9058,5 +9073,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9134,5 +9149,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9140,5 +9155,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9154,15 +9169,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9170,10 +9178,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9181,5 +9190,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9187,5 +9196,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9193,6 +9202,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9205,32 +9214,37 @@
 msgstr "Błąd parsowania danych"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9242,5 +9256,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9261,5 +9275,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Niedozwolony obiekt z id=0"
 
@@ -9268,26 +9282,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9295,10 +9298,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9310,5 +9313,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9316,5 +9319,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9322,6 +9325,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9329,5 +9332,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9336,5 +9339,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9353,10 +9356,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9389,5 +9387,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9402,5 +9400,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9411,5 +9409,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Nie można połączyć z serwerem OSM. Proszę sprawdzić swoje połączenie z "
@@ -9417,5 +9415,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9425,5 +9423,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9433,5 +9431,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9472,5 +9470,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9875,5 +9873,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9946,5 +9944,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9953,5 +9951,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9960,5 +9958,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9967,5 +9965,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9974,5 +9972,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10112,4 +10110,133 @@
 msgstr "Wysyła ślady do openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolacja adresów"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10228,4 +10355,9 @@
 msgid "Error while parsing {0}"
 msgstr "Błąd podczas przetwarzania {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nie można odczytać \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10510,13 +10642,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10525,13 +10657,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10885,28 +11017,28 @@
 msgstr "Pusta warstwa"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10915,14 +11047,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12299,13 +12431,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12328,41 +12451,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Użytkownik"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Pokaż panel autorów"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Otwórz stronę użytkownika"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Otwiera stronę użytkownika w przeglądarce"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Wybierz dane użytkownika"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Proszę zaznaczyć jakieś dane"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12534,10 +12620,10 @@
 msgstr "Sprawdzanie poprawności przebiegło pomyślnie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Siatka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12617,12 +12703,30 @@
 msgstr "pozostałe informacje z sprawdzania poprawności"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Sprawdzanie poprawności"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Przeprowadza sprawdzanie poprawności danych"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12692,21 +12796,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Linie brzegowe"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Ten test sprawdza czy linie brzegowe są poprawne."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Przecinające się drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12714,35 +12818,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12750,5 +12854,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12766,18 +12870,18 @@
 msgstr "Powielone węzły drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Nakładające się drogi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12785,29 +12889,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Nakładające się obszary"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Nakładające się tory kolejowe"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Nakładające się drogi"
@@ -12824,33 +12928,33 @@
 "Ten test sprawdza czy droga zawiera niektóre węzły więcej niż jeden raz."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Drogi bez nazwy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12859,7 +12963,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12867,80 +12971,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "DO POPRAWKI"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12948,130 +13052,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13167,5 +13271,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13181,91 +13285,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "obszar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Niepołączone drogi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Drogi bez nazwy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Drogi bez tagów"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Puste drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Drogi z jednym węzłem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13653,6 +13757,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13661,10 +13770,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13676,10 +13785,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13687,10 +13796,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13699,10 +13808,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13711,20 +13820,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13734,10 +13843,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13745,5 +13854,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13753,10 +13862,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13766,15 +13875,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13782,5 +13891,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13788,5 +13897,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13795,15 +13904,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13812,10 +13921,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13824,15 +13933,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13842,13 +13951,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18823,4 +18925,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19575,10 +19697,4 @@
 msgid "Country code"
 msgstr "Kod kraju"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolacja adresów"
 
 #. item
@@ -25756,4 +25872,7 @@
 #~ msgstr "E-mail"
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niezapisane zmiany"
+
 #~ msgid "Object"
 #~ msgstr "Obiekt"
@@ -25809,4 +25928,7 @@
 #~ msgid "Charge"
 #~ msgstr "Opłata"
+
+#~ msgid "No data imported."
+#~ msgstr "Nie zaimportowano danych."
 
 #~ msgid "rectifier id={0}"
@@ -25988,4 +26110,13 @@
 #~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
 
+#~ msgid "User"
+#~ msgstr "Użytkownik"
+
+#~ msgid "Open User Page"
+#~ msgstr "Otwórz stronę użytkownika"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Otwiera stronę użytkownika w przeglądarce"
+
 #~ msgid "Portcullis"
 #~ msgstr "brona"
@@ -26015,4 +26146,13 @@
 #~ msgid "Navigation"
 #~ msgstr "Nawigacja"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Pokaż panel autorów"
+
+#~ msgid "Please select some data"
+#~ msgstr "Proszę zaznaczyć jakieś dane"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Wybierz dane użytkownika"
 
 #~ msgid "Occupied By"
@@ -26050,4 +26190,74 @@
 #~ msgstr "Wszystkie trasy są puste"
 
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
+#~ "przesłane elementy posiadają historię."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Scal mimo tego"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} obiekt ma konflikt:"
+#~ msgstr[1] "{0} obiekty mają konflikt:"
+#~ msgstr[2] "{0} obiektów ma konflikt:"
+
+#~ msgid "Delete and Download"
+#~ msgstr "Usuń i pobierz"
+
+#~ msgid "Board Type"
+#~ msgstr "Rodzaj tablicy"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
+#~ "jakakolwiek warstwa danych?"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
+#~ "conditions for no layer\"."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Nieprawidłowe odwzorowanie"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Inicjalizacja API nie powiodła się."
+
+#~ msgid "No data"
+#~ msgstr "Brak danych"
+
+#~ msgid "Update failed"
+#~ msgstr "Aktualizacja się nie powiodła"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
+#~ msgstr[1] ""
+#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
+#~ msgstr[2] ""
+#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
@@ -26060,64 +26270,2 @@
 #~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
 #~ "lub <A HREF=\"{1}\">po polsku</A>."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
-#~ "przesłane elementy posiadają historię."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Scal mimo tego"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} obiekt ma konflikt:"
-#~ msgstr[1] "{0} obiekty mają konflikt:"
-#~ msgstr[2] "{0} obiektów ma konflikt:"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- używasz wersji {0}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Usuń i pobierz"
-
-#~ msgid "Board Type"
-#~ msgstr "Rodzaj tablicy"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
-#~ "jakakolwiek warstwa danych?"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
-#~ "conditions for no layer\"."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Nieprawidłowe odwzorowanie"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inicjalizacja API nie powiodła się."
-
-#~ msgid "No data"
-#~ msgstr "Brak danych"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizacja się nie powiodła"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:02+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:45+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Ajuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "A projeção {0} nâo pode ser ativada. Usando Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,82 +115,11 @@
 msgstr "Erro"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Alterações Não Salvas"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Salvar e Sair"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Descartar e Sair"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL malformada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -207,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -221,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -246,13 +180,13 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando arquivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -395,4 +329,52 @@
 msgid "Merge"
 msgstr "Combinar"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Cancelar"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -488,4 +470,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -500,5 +483,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -535,6 +518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -556,46 +539,4 @@
 msgid "Please select at least three nodes."
 msgstr "Por favor, selecione no mínimo 3 nós."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"O número de alterações atuais ultrapassa o número máximo de alterações. O "
-"número atual é {0}, o máximo é {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Violação de Capacidades da API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Aviso: truncanto automaticamente o valor da tag ''{0}'' na primitiva "
-"deletada {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"O tamanho do valor para a tag ''{0}'' na primitiva  {1} excede o tamanho "
-"máximo permitido de {2}. O tamanho é {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Violação de Précondição"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -664,5 +605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -780,5 +721,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -794,5 +735,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -842,8 +783,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1015,5 +958,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parâmetro ''{0}'' não pode ser nulo"
 
@@ -1021,5 +964,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
 
@@ -1051,5 +994,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Editar"
@@ -1753,14 +1696,14 @@
 msgstr "Seleção vazia"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Enviar para o OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Enviar todas as modificações ao servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1769,23 +1712,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Não há nada a enviar. Baixe dados primeiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Não há modificações a enviar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} apenas"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchronizar todo o conjunto de dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1806,17 +1749,17 @@
 "</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Detectado conflito"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "valor não esperado de retorno. Veio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1831,16 +1774,17 @@
 "<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1848,23 +1792,23 @@
 "Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Envio para API OSM falhou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Atualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1976,8 +1920,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Não há dados importados."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2528,4 +2468,70 @@
 msgstr "Erro de comunicação com o servidor."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"O número de alterações atuais ultrapassa o número máximo de alterações. O "
+"número atual é {0}, o máximo é {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Violação de Capacidades da API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Aviso: truncanto automaticamente o valor da tag ''{0}'' na primitiva "
+"deletada {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"O tamanho do valor para a tag ''{0}'' na primitiva  {1} excede o tamanho "
+"máximo permitido de {2}. O tamanho é {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Violação de Précondição"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2627,6 +2633,6 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr "já registrado um conflito para a primitiva \"{0}\""
 
@@ -2653,5 +2659,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "não foi possível resolver conflito não-definido"
 
@@ -2707,5 +2713,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Dividir segmento de via"
@@ -2713,6 +2719,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2724,5 +2730,5 @@
 "<br>Realmente quer apagar?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Apagar confirmação"
@@ -2830,7 +2836,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Resolver conflitos na lista de nós do caminho {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3000,5 +3006,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "já registrado um conflito para a primitiva \"{0}\""
 
@@ -3017,18 +3023,21 @@
 msgstr "Graus Minutos Segundos"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "L"
@@ -3042,41 +3051,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "parametro {0} > 0 necessário. Obtido {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3094,29 +3125,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
 
@@ -3126,33 +3158,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "não foi encontrada a última versão. Histórico está vazio."
 
@@ -3167,12 +3200,6 @@
 "dados"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 "não é possível comparar um primitivo com id ''{0}'' com um primitivo com id "
@@ -3182,5 +3209,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
 
@@ -3333,5 +3360,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3342,5 +3369,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3351,5 +3378,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3838,5 +3865,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "camada não está na lista."
 
@@ -3901,5 +3928,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "regra {0} não participa no par de comparação {1}"
 
@@ -4003,5 +4030,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "parâmetro atual fora do intervalo: obtido {0}"
 
@@ -4009,15 +4036,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "lista em regra {0} não está participando de um par comparado"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valor inesperado do parâmetro \"index\": {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "item {0} não encontrado na lista"
 
@@ -4076,5 +4103,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar meus elementos selecionados para o fim da lista de elementos "
@@ -4084,5 +4111,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copiar meus elementos selecionados antes do primeiro elemento selecionado na "
@@ -4092,5 +4119,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Copiar meus elementos selecionados depois do primeiro elemento selecionado "
@@ -4098,5 +4125,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Copiar os elementos selecionados deles para o começo da lista de elementos "
@@ -4104,5 +4132,5 @@
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Copiar os elementos selecionados deles para o fim da lista de elementos "
@@ -4112,5 +4140,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Copiar os elementos selecionados deles antes do primeiro elemento "
@@ -4131,5 +4159,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Move uma posição acima os elementos selecionados"
 
@@ -4140,5 +4168,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Mover para baixo as entradas selecionadas em uma posição"
 
@@ -4153,5 +4181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Remover as entradas selecionadas da lista de elementos combinados"
 
@@ -4163,5 +4191,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Congelar a lista atual de elementos mesclados"
 
@@ -4171,5 +4199,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Descongelar a lista de elementos mesclados e iniciar mesclagem"
 
@@ -4177,5 +4205,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas "
@@ -4185,5 +4214,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4216,15 +4245,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"ajustável {0} ainda não é registrado. Não é possível definir a participação "
-"no ajuste sincronizado"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "ajustável {0} ainda não é registrado"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4233,5 +4260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 "Nós mesclados ainda não congelados. Não é possível construir comando de "
@@ -4241,5 +4268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "indice inesperado na coluna. Obtido {0}"
 
@@ -4445,5 +4472,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "nós combinados não congelados ainda. Não é possível construir comando de "
@@ -4506,5 +4533,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4512,5 +4539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
 
@@ -4620,14 +4647,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4636,7 +4663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4701,5 +4726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4722,4 +4747,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4877,5 +4907,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4933,5 +4963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "índice fora dos limites. Obtido {0}"
 
@@ -4969,5 +4999,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Mostrar histórico da primitiva selecionada"
 
@@ -5037,5 +5067,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<diferente>"
@@ -5262,6 +5292,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Editar relação referente à relação selecionada atualmente"
 
@@ -5313,5 +5342,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5545,4 +5573,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Editar relação referente à relação selecionada atualmente"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5576,6 +5608,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5845,5 +5882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "histórico não foi inicializado ainda. Falha ao definir primitiva de "
@@ -5853,10 +5890,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 "Falha ao difinir referência. Versão de referência {0}  dnão disponível no "
@@ -5864,10 +5903,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+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:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 "Falha ao definir atual. Versão atual {0} não está disponível no histórico"
@@ -5876,9 +5917,4 @@
 msgid "Load history"
 msgstr "Carregar histórico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6990,4 +7026,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Descartar e Sair"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7001,4 +7041,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Salvar e Sair"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7221,6 +7265,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7336,36 +7383,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "ponto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7373,5 +7420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7380,5 +7427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7413,4 +7460,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7469,5 +7517,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
@@ -7482,5 +7530,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
@@ -7488,5 +7536,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7590,5 +7638,5 @@
 msgstr "Converter para camada GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7596,28 +7644,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "trilha"
-msgstr[1] "trilhas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7625,5 +7657,5 @@
 msgstr[1] "pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7632,5 +7664,5 @@
 msgstr[1] "uma trilha com {0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7639,5 +7671,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7768,5 +7800,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Por favor, selecione a linha para editar."
@@ -7782,5 +7814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7959,4 +7991,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8500,5 +8533,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr ""
@@ -8685,33 +8718,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Mais informações sobre esta característica"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Atributos opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usar preferencia ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "via sem saída"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8722,15 +8756,15 @@
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementos do tipo {0} são suportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8740,18 +8774,18 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Alterar propriedades"
@@ -8781,10 +8815,4 @@
 msgstr "Baixando pontos {0} a {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8798,11 +8826,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Não foi possível ler \"{0}\""
 
@@ -8821,5 +8848,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Descrição da trilha do GPS"
 
@@ -8883,5 +8910,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8894,5 +8920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
 
@@ -8904,5 +8930,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8954,5 +8980,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8992,5 +9018,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -9008,5 +9034,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -9014,5 +9040,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -9020,5 +9046,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9030,10 +9056,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9052,5 +9072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -9082,20 +9102,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9108,5 +9123,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9123,6 +9138,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9133,15 +9154,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9149,11 +9170,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9172,5 +9187,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9248,5 +9263,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9254,5 +9269,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9268,15 +9283,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9284,10 +9292,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9295,5 +9304,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9301,5 +9310,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9307,6 +9316,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9319,32 +9328,37 @@
 msgstr "Erro durante interpretação."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9356,5 +9370,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9375,5 +9389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Objeto ilegal com id=0"
 
@@ -9382,26 +9396,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9409,10 +9412,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9424,5 +9427,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9430,5 +9433,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9436,6 +9439,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9443,5 +9446,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9450,5 +9453,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9467,10 +9470,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9503,5 +9501,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9516,5 +9514,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9525,5 +9523,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Não foi possível conectar com o servidor OSM. Por favor, verifique sua "
@@ -9531,5 +9529,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9539,5 +9537,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9547,5 +9545,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9586,5 +9584,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9990,5 +9988,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10062,5 +10060,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10069,5 +10067,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10076,5 +10074,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10083,5 +10081,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10090,5 +10088,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10228,4 +10226,133 @@
 msgstr "Enviar trilhas para openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolação de Endereços"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Ímpar"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Par"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10342,4 +10469,9 @@
 msgid "Error while parsing {0}"
 msgstr "Erro enquanto analisava {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, 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
@@ -10622,13 +10754,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10637,13 +10769,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10998,28 +11130,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11028,14 +11160,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12406,13 +12538,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Par"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Ímpar"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12437,41 +12560,4 @@
 msgstr "Opcional"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Usuário"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr ""
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
@@ -12641,10 +12727,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12722,11 +12808,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validação"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
 msgstr ""
 
@@ -12797,21 +12901,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12819,35 +12923,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12855,5 +12959,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12871,18 +12975,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12890,29 +12994,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12928,33 +13032,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12963,7 +13067,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12971,80 +13075,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13052,130 +13156,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Origens de dados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13271,5 +13375,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13285,91 +13389,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13755,6 +13859,11 @@
 msgstr "Você deve tornar suas edições públicas para enviar novos dados"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13763,10 +13872,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13778,10 +13887,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13789,10 +13898,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13801,10 +13910,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13813,20 +13922,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13836,10 +13945,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13847,5 +13956,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13855,10 +13964,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13868,15 +13977,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13884,5 +13993,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13890,5 +13999,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13897,15 +14006,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13914,10 +14023,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13926,15 +14035,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13944,13 +14053,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18923,4 +19025,24 @@
 msgstr "estádio"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19675,10 +19797,4 @@
 msgid "Country code"
 msgstr "Código do país"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolação de Endereços"
 
 #. item
@@ -25844,7 +25960,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parâmetro '{0}' não pode ser nulo"
-
 #~ msgid "Unknown version"
 #~ msgstr "Versão desconhecida"
@@ -25852,4 +25965,7 @@
 #~ msgid "Aborting..."
 #~ msgstr "Interrompendo..."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Alterações Não Salvas"
 
 #~ msgid "Rotate"
@@ -25923,7 +26039,4 @@
 #~ msgstr "Editar nova relação"
 
-#~ msgid "Create new relation"
-#~ msgstr "Criar nova relação"
-
 #~ msgid "Basic"
 #~ msgstr "Básico"
@@ -26010,4 +26123,7 @@
 #~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
 #~ "camada de dados?"
+
+#~ msgid "No data imported."
+#~ msgstr "Não há dados importados."
 
 #~ msgid "Data Layer"
@@ -26125,6 +26241,6 @@
 #~ "Não faça o upload de nenhuma informação depois desta mensagem."
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- versão em execução é {0}"
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parâmetro '{0}' não pode ser nulo"
 
 #~ msgid "Oberpfalz Geofabrik.de"
@@ -26136,4 +26252,7 @@
 #~ msgid "Public"
 #~ msgstr "Público"
+
+#~ msgid "User"
+#~ msgstr "Usuário"
 
 #~ msgid "Continue anyway"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:12+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 14:30+0000\n"
 "Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\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-09-20 08:25+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -23,5 +23,5 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -29,5 +29,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -36,14 +36,14 @@
 msgstr "_Ajutor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -80,6 +80,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -94,4 +94,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -107,6 +112,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -114,82 +119,11 @@
 msgstr "Eroare"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Modificări nesalvate"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Salvez şi Ies"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Renunţ şi Ies"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Renunţă"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Se ignoră URL-ul prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -211,7 +145,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -225,5 +159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -250,13 +184,13 @@
 msgstr "Avertisment"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Se ingoră fişierul URL prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -399,4 +333,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Renunţă"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -490,4 +472,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -502,5 +485,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -537,6 +520,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -558,39 +541,4 @@
 msgid "Please select at least three nodes."
 msgstr "Te rog selectează cel puţin trei noduri."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -659,5 +607,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -769,5 +717,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -783,5 +731,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -831,8 +779,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1003,5 +953,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr ""
 
@@ -1009,5 +959,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1039,5 +989,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Editare"
@@ -1713,14 +1663,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Despre JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Trimite toate schimbările la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1729,23 +1679,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1759,17 +1709,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1780,39 +1730,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1924,8 +1875,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Nu au fost importate date."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2441,4 +2388,63 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
 msgid "Error while communicating with server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
 msgstr ""
 
@@ -2543,6 +2549,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2567,5 +2573,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2621,5 +2627,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2627,6 +2633,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2635,5 +2641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2907,5 +2913,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2924,18 +2930,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr ""
@@ -2949,41 +2958,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3001,29 +3032,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3033,33 +3065,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3072,12 +3105,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3085,5 +3112,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3233,5 +3260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3243,5 +3270,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3253,5 +3280,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3729,5 +3756,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "stratul nu este în listă."
 
@@ -3790,5 +3817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3888,5 +3915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3894,15 +3921,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3958,5 +3985,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3964,5 +3991,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3970,13 +3997,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3984,5 +4012,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -3999,5 +4027,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4008,5 +4036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4021,5 +4049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4031,5 +4059,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4039,5 +4067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4045,5 +4073,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4051,5 +4080,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4080,6 +4109,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4087,5 +4116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4095,5 +4124,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4101,5 +4130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4294,5 +4323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4353,5 +4382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4359,5 +4388,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4467,14 +4496,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4483,7 +4512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4548,5 +4575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4569,4 +4596,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4726,5 +4758,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4782,5 +4814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4818,5 +4850,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4886,5 +4918,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<diferit>"
@@ -5111,6 +5143,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5162,5 +5193,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5386,4 +5416,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5417,5 +5451,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5682,5 +5721,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5688,28 +5727,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6822,4 +6860,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Renunţ şi Ies"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6833,4 +6875,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Salvez şi Ies"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7051,6 +7097,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7167,36 +7216,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "punct gps"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7204,5 +7253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7211,5 +7260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7244,4 +7293,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7300,5 +7350,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
@@ -7311,5 +7361,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
@@ -7317,5 +7367,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7417,5 +7467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7423,29 +7473,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "urmă"
-msgstr[1] "urme"
-msgstr[2] "de urme"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7454,5 +7487,5 @@
 msgstr[2] "de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7462,5 +7495,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7470,5 +7503,5 @@
 msgstr[2] "{0} este format din {1} de urme"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7597,5 +7630,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Vă rog selectaţi rândul care va fi editat."
@@ -7611,5 +7644,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7777,4 +7810,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8320,5 +8354,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Şterge sursele selectate din listă."
@@ -8505,33 +8539,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8542,15 +8577,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8561,18 +8596,18 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Modificare proprietăţi"
@@ -8602,10 +8637,4 @@
 msgstr "Descarc punctele {0} până la {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8619,11 +8648,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Nu am putut citi \"{0}\""
 
@@ -8640,5 +8668,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "descrierea pistei gps"
 
@@ -8700,5 +8728,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8711,5 +8738,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
@@ -8721,5 +8748,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8771,5 +8798,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8809,5 +8836,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8825,5 +8852,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8831,5 +8858,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8837,5 +8864,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8849,10 +8876,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -8869,5 +8890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8899,20 +8920,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8925,5 +8941,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8940,6 +8956,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8950,15 +8972,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8966,11 +8988,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -8989,5 +9005,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9067,5 +9083,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9073,5 +9089,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9087,15 +9103,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9103,10 +9112,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9114,5 +9124,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9120,5 +9130,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9126,6 +9136,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9138,32 +9148,37 @@
 msgstr "Eroare la prelucrare."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9175,5 +9190,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9194,5 +9209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Obiect ilegal cu id=0"
 
@@ -9201,26 +9216,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9228,10 +9232,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9243,5 +9247,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9249,5 +9253,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9255,6 +9259,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9262,5 +9266,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9269,5 +9273,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9286,10 +9290,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9322,5 +9321,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9335,5 +9334,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9344,9 +9343,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9356,5 +9355,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9364,5 +9363,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9403,5 +9402,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9779,5 +9778,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9842,5 +9841,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9849,5 +9848,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9856,5 +9855,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9863,5 +9862,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9870,5 +9869,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10008,4 +10007,133 @@
 msgstr ""
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10120,4 +10248,9 @@
 msgid "Error while parsing {0}"
 msgstr "Eroare la prelucrarea {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nu am putut citi \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10400,13 +10533,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10415,13 +10548,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10774,28 +10907,28 @@
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10804,14 +10937,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12182,13 +12315,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12211,41 +12335,4 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
 msgid "Optional"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
 msgstr ""
 
@@ -12417,10 +12504,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12498,11 +12585,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
 msgstr ""
 
@@ -12573,21 +12678,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12595,35 +12700,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12631,5 +12736,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12647,18 +12752,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12666,29 +12771,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr ""
@@ -12704,33 +12809,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12739,7 +12844,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12747,80 +12852,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12828,130 +12933,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13047,5 +13152,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13061,91 +13166,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13531,6 +13636,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13539,10 +13649,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13554,10 +13664,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13565,10 +13675,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13577,10 +13687,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13589,20 +13699,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13612,10 +13722,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13623,5 +13733,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13631,10 +13741,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13644,15 +13754,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13660,5 +13770,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13666,5 +13776,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13673,15 +13783,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13690,10 +13800,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13702,15 +13812,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13720,13 +13830,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18699,4 +18802,24 @@
 msgstr ""
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19450,10 +19573,4 @@
 #: build/trans_presets.java:2275
 msgid "Country code"
-msgstr ""
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
 msgstr ""
 
@@ -25662,4 +25779,7 @@
 #~ "server."
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Modificări nesalvate"
+
 #~ msgid "my version:"
 #~ msgstr "versiunea mea:"
@@ -25685,4 +25805,7 @@
 #~ msgid "unnamed"
 #~ msgstr "fără nume"
+
+#~ msgid "No data imported."
+#~ msgstr "Nu au fost importate date."
 
 #~ msgid "No document open so nothing to save."
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 17764)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-20 08:19+0000\n"
-"Last-Translator: Calibrator <Unknown>\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:18+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,10 @@
 "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-09-20 08:24+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -28,5 +28,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -35,14 +35,14 @@
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Невозможно активировать защиту {0}. Используется Меркатор"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -79,6 +79,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -93,4 +93,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -106,6 +111,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -113,89 +118,11 @@
 msgstr "Ошибка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Присутствуют не сохранённые изменения на {0} слое. Отменить изменения и "
-"продолжить?"
-msgstr[1] ""
-"Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
-"продолжить?"
-msgstr[2] ""
-"Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
-"продолжить?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Несохранённые изменения"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Сохранить и выйти"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Отменить и выйти"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Отмена"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -217,7 +144,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -231,5 +158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -256,13 +183,13 @@
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорируется неверный адрес файла: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -372,5 +299,5 @@
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: неожиданный формат адреса базы API. Перенаправление на "
-"страницу информации или истории изменений OSM-примитива невозможно. Адрес "
+"страницу информации или истории изменений элементов OSM невозможно. Адрес "
 "базы API: ''{0}''"
 
@@ -387,6 +314,6 @@
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
-"Пожалуйста, выберите по крайней мере одну уже загруженную точку, линию или "
-"отношение."
+"Пожалуйста, выберите по крайней мере одну уже загруженную на сервер точку, "
+"линию или отношение."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
@@ -397,5 +324,5 @@
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} выделенных "
-"примитивов"
+"элементов"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
@@ -412,4 +339,52 @@
 msgid "Merge"
 msgstr "Объединить"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Отмена"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
 msgid "Align Nodes in Circle"
-msgstr "Выстроить точки окружностью"
+msgstr "Выстроить точки так, чтобы они сформировали окружность"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
@@ -505,4 +480,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -517,5 +493,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -552,6 +528,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -563,5 +539,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
 msgid "Align Nodes in Line"
-msgstr "Выстроить точки линией"
+msgstr "Выстроить точки в линию"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
@@ -574,45 +550,4 @@
 msgid "Please select at least three nodes."
 msgstr "Выделите не менее трёх точек."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Текущее число изменений превысило максимальное, текущее - {0}, максимальное "
-"- {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Нарушение возможностей API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Предупреждение: автоматическое усечение значения  тэга ''{0}'' на удалённом "
-"примитиве {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Длина значения  'для тега '{0}'' примитива  {1} превышает максимально "
-"допустимую длину {2}. Значение длины {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Нарушение предусловия"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -681,5 +616,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -739,5 +674,6 @@
 "reverse some of them?"
 msgstr ""
-"Линии с их текущими направлениями не объединить. Обратить некоторые линии?"
+"Линии с их текущими направлениями не объединить. Поменять направление "
+"некоторых линий?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
@@ -783,5 +719,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Эти узлы не в круге. Операция прервана."
+msgstr "Эти точки не в круге. Операция прервана."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -789,10 +725,11 @@
 "Please select exactly two or three nodes or one way with exactly two or "
 "three nodes."
-msgstr "Выберите 2 или 3 узла или линию с двумя или тремя узлами."
+msgstr ""
+"Выберите две или три точки или же одну линию с двумя или тремя точками."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -808,5 +745,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -840,5 +777,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Расположить точки на равных расстояниях вдоль линии."
+msgstr "Расположить выделенные точки на равных расстояниях вдоль линии."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
@@ -856,8 +793,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -869,17 +808,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
-msgstr "Выберите хотя бы один тип данных для загрузки."
+msgstr "Выберите хотя бы один тип данных для скачивания."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download referrers from OSM..."
-msgstr "Загрузить зависимости с OSM..."
+msgstr "Скачать зависимости с OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download primitives referring to one of the selected primitives"
-msgstr "Загрузить примитивы связанные с выбранными примитивами"
+msgstr "Скачать элементы, сославшись на один из выбранных элементов"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 msgid "Download referrers..."
-msgstr "Загрузить зависимости..."
+msgstr "Скачать зависимости..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
@@ -895,10 +834,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
 msgid "Conflicts during download"
-msgstr "Конфликт в процессе загрузки"
+msgstr "Конфликт во время скачивания"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr "({0}/{1}) Загрузка родителей примитива {2}"
+msgstr "({0}/{1}) Загрузка родителей элемента {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
@@ -1028,5 +967,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "параметр ''{0}'' не должен быть null"
 
@@ -1034,5 +973,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
 
@@ -1064,5 +1003,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Правка"
@@ -1117,5 +1056,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Показать информацию об объектах о OSM: линиях, точках или отношениях."
+msgstr "Показать информацию об объектах OSM: линиях, точках или отношениях."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -1175,5 +1114,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Объедините выбранные примитивы в другой слой"
+msgstr "Объедините выбранные элементы в другой слой"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
@@ -1185,9 +1124,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 msgid "Mirror selected nodes and ways."
-msgstr "Зеркало выбранных узлов и путей."
+msgstr "Отзеркалить выбранные точки и линии."
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 msgid "Please select at least one node or way."
-msgstr "Пожалуйста, выберите хотябы один узел или путь."
+msgstr "Пожалуйста, выберите хотя бы одну точку или линию."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
@@ -1274,13 +1213,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
 msgid "Enter URL to download:"
-msgstr "Введите URL для загрузки:"
+msgstr "Введите URL для скачивания:"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
 msgid "Download Location"
-msgstr "Путь загрузки"
+msgstr "Каталог для скачивания"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 msgid "Download URL"
-msgstr "Загрузить URL"
+msgstr "Скачать URL"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
@@ -1297,15 +1236,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
 msgid "Only two nodes allowed"
-msgstr "Возможно выбрать только две точки"
+msgstr "Можно только две точки"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Selection must consist only of ways."
-msgstr "Возможно выбирать только линии."
+msgstr "Должны быть выделены только линии."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select one or more closed ways of at least four nodes."
 msgstr ""
-"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
-"точек."
+"Пожалуйста, выберите одну или несолько замкнутых линий, состоящих, как "
+"минимум, из четырех точек."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
@@ -1359,7 +1298,7 @@
 msgid "to {0} primitive"
 msgid_plural "to {0} primtives"
-msgstr[0] "для одного элемента"
-msgstr[1] "для {0} элементов"
-msgstr[2] "для {0} элементов"
+msgstr[0] "для элемента {0}"
+msgstr[1] "для элементов {0}"
+msgstr[2] "для элементов {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1406,5 +1345,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 msgid "Reverse the direction of all selected ways."
-msgstr "Изменить направление линии на противоположное."
+msgstr "Изменить направление всех выделенных линий."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
@@ -1414,5 +1353,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
 msgid "Reverse ways"
-msgstr "Изменить направление линии"
+msgstr "Изменить направление линий"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
@@ -1462,5 +1401,5 @@
 "if you rejected all. Continue?"
 msgstr ""
-"Имеются неразрешенные конфликты. Конфликтующие объекты не будут сохранены и "
+"Имеются неустранённыеконфликты. Конфликтующие объекты не будут сохранены и "
 "будут обработаны, как будто вы отменили их все. Продолжить?"
 
@@ -1549,7 +1488,7 @@
 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] "Выбранная точка не является частью пути."
-msgstr[1] "Выбранная точка не является частью пути."
-msgstr[2] "Выбранные точки не являются частью пути."
+msgstr[0] "Выбранная точка не находится в середине какой-либо линии."
+msgstr[1] "Выбранные точки не находится в середине линии."
+msgstr[2] "Выбранные точки не находится в середине какой-либо линии."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
@@ -1561,14 +1500,12 @@
 "way also."
 msgstr[0] ""
-"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста "
-"выберите путь ещё.\r\n"
-"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста "
-"выберите путь ещё."
+"Есть несколько линий, использующих точку, которую вы выделили. Пожалуйста, "
+"выделите также линию."
 msgstr[1] ""
-"Есть несколько путей использующих точку которую вы выбрали. Пожалуйста "
-"выберите путь ещё."
+"Есть несколько линий, использующих точки, которые вы выбрали. Пожалуйста, "
+"выберите также линию."
 msgstr[2] ""
-"Есть несколько путей использующих точки которые вы выбрали. Пожалуйста "
-"выберите путь ещё."
+"Есть несколько линий, использующих точки, которые вы выбрали. Пожалуйста, "
+"выберите также линию."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
@@ -1579,12 +1516,12 @@
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Выбранная линия не содержит выбранной точки"
+msgstr[0] "Выбранная линия не содержит все выбранные точки"
 msgstr[1] "Выбранная линия не содержит выбранных точек"
-msgstr[2] "Выбранная линия не содержит выбранных точек"
+msgstr[2] "Выбранная линия не содержит все выбранные точки"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
 msgid "You must select two or more nodes to split a circular way."
-msgstr "Чтобы разделить замкнутую линию, выберите две или более точки."
+msgstr "Чтобы разделить замкнутую линию, выделите не менее двух точек."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
@@ -1593,6 +1530,6 @@
 "middle of the way.)"
 msgstr ""
-"Линию невозможно разделить в выделенных точках. (Выберите точки в середине "
-"линии)"
+"Линию невозможно разделить в выделенных точках. (Выделите точки в середине "
+"линии)."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
@@ -1610,5 +1547,5 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>Член отношения был скопирован во все новые линии.<br>Результат "
+"<html>Участник отношения был скопирован во все новые линии.<br>Результат "
 "необходимо проверить и исправить, если потребуется.</html>"
 
@@ -1643,13 +1580,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
 msgid "This node is not glued to anything else."
-msgstr "Данная точка не связана с чем-либо еще."
+msgstr "Данная точка ни к чему не прикреплена."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
 msgid "None of these nodes are glued to anything else."
-msgstr "Ни одна из этих точек не притянута к другим."
+msgstr "Ни одна из этих точек ни к чему не прикреплена."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of this way's nodes are glued to anything else."
-msgstr "Ни одна из этих линий не притянута к другим."
+msgstr ""
+"Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
@@ -1663,5 +1601,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid "* One tagged node, or"
-msgstr "* Одна точка с тэгами, или"
+msgstr "* Одна точка с тегами, либо"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
@@ -1693,7 +1631,7 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"Прим.: Если выбрана линия, она получит дубликаты узлов, \n"
-"и они будут выбраны. В противном случае, все линии получат\n"
-"дубликаты точек, и все точки будут выбраны"
+"Прим.: Если выбрана линия, она получит дубликаты точек, и они\n"
+"будут выбраны. В противном случае, все линии получат дубликаты\n"
+"и все точки будут выбраны."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
@@ -1762,5 +1700,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr "Не найден примитив с id {0} в текущем наборе данных"
+msgstr "Не найден элемент с id {0} в текущем наборе данных"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1771,9 +1709,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Updates the currently selected primitives from the server"
-msgstr "Обновить выбранные примитивы с сервера"
+msgstr "Обновить выбранные элементы с сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "There are no selected primitives to update."
-msgstr "Не выбраны примитивы для обновления."
+msgstr "Не выбраны элементы для обновления."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
@@ -1781,14 +1719,14 @@
 msgstr "Выборка пуста"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Загрузить на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Загрузить все изменения на OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1796,26 +1734,26 @@
 "resolve them first.</html>"
 msgstr ""
-"<html>Имеются неразрешённые конфликты в слое''{0}''.<br>Вам надо их "
-"разрешить.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+"<html>Имеются неустранённые конфликты в слое''{0}''.<br>Вам надо их "
+"устранить.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
-msgstr "Нет изменений для загрузки."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+msgstr "Нет изменений для загрузки на сервер."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Синхронизированы только {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Синхронизировать весь набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1828,26 +1766,26 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-"<html>Загрузка <strong>прервана</strong> так как на сервере есть более новая "
-"версия одной<br>из ваших точек, линий или отношений.<br>Причиной конфликта "
-"является <strong>{0}</strong> с id <strong>{1}</strong>,<br>версия данных на "
-"сервере {2}, ваша версия {3}.<br><br>Нажмите <strong>{4}</strong> что бы "
-"синхронизировать только конфликтный элемент.<br>Нажмите <strong>{5}</strong> "
-"что бы синхронизировать весь локальный набор данных с сервером.<br>Нажмите "
-"<strong>{6}</strong> чтобы прервать, затем продолжите редактирование.<br></"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+"<html>Загрузка на сервер <strong>прервана</strong> так как на сервере есть "
+"более новая версия одной<br>из ваших точек, линий или отношений.<br>Причиной "
+"конфликта является <strong>{0}</strong> с id <strong>{1}</strong>,<br>версия "
+"данных на сервере {2}, ваша версия {3}.<br><br>Нажмите <strong>{4}</strong>, "
+"чтобы синхронизировать только конфликтный элемент.<br>Нажмите <strong>{5}</"
+"strong>, чтобы синхронизировать весь локальный набор данных с сервером."
+"<br>Нажмите <strong>{6}</strong>, чтобы прервать, затем продолжите "
+"редактирование.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Обнаружен конфликт"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "неожиданное возвращённое значение. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1857,54 +1795,56 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-"<html><strong>Ошибка </strong>обновления, так как на сервере имеется более "
-"новая версия одной <br> из ваших точек, линий или отношений. <br><br>. "
-"Нажмите на <strong>{0}</strong> для синхронизации локальных данных с "
-"сервером. <br> Нажмите <strong>{1}</strong> чтобы прервать, затем продолжите "
-"редактирование.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+"<html><strong>Загрузка на сервер </strong>не удалась, так как на сервере "
+"имеется более новая версия одной <br> из ваших точек, линий или отношений. "
+"<br><br>. Нажмите на <strong>{0}</strong> для синхронизации локальных данных "
+"с сервером. <br> Нажмите <strong>{1}</strong> чтобы прервать, затем "
+"продолжите редактирование.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-"<html>Загрузка <strong>не удалась</strong> потому что вы "
-"используете<br>пакет изменений {0}, который был уже закрыт в {1}."
-"<br>Пожалуйста, загрузите еще раз новый или существующий открытый пакет "
-"изменений."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>Загрузка на сервер <strong>не удалась</strong> потому что вы "
+"используете<br>пакет изменений {0}, который уже был закрыт в {1}."
+"<br>Пожалуйста, загрузите снова, используя новый или существующий открытый "
+"пакет изменений.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr "Пакет изменений закрыт"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
-"Предупреждение: заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}"
-"\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+"Предупреждение: ошибочный заголовок \"{0}\" не соответствует ожидаемой "
+"структуре \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+msgstr ""
+"Ошиочный заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Не удалось загрузить данные.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+msgstr "<html>Загрузка на сервер <strong>не удалась</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
-msgstr "Ошибка выгрузки в OSM API"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+msgstr "Ошибка загрузки в OSM API"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
-msgstr "Обновление примитива"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+msgstr "Обновление элемента"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Выгрузка данных по слою ''{0}''"
+msgstr "Загрузка данных на сервер по слою ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -2006,5 +1946,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
 msgid "Downloading data"
-msgstr "Загрузка данных"
+msgstr "Скачивание данных"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
@@ -2012,9 +1952,7 @@
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Ошибка игнорируется, так как загрузка была отменена. Текст ошибки: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Данные не импортированы"
+msgstr ""
+"Игнорирование исключения, так как скачивание было отменено. Исключение было: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2030,9 +1968,10 @@
 #, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr "Во время пакетной загрузки обнаружены следующие ошибки:{0}"
+msgstr ""
+"Во время скачивания большого массива данных обнаружены следующие ошибки:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
 msgid "Errors during Download"
-msgstr "Ошибка в течение загрузки"
+msgstr "Ошибка во время скачивания"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
@@ -2045,13 +1984,13 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-"<html>{0} примитив(ов) в вашем наборе данных которые<br>могут быть удалены "
+"<html>Кол-во элементов в вашем наборе данных: {0} <br>Они могут быть удалены "
 "на сервере. В дальнейшем, если вы попытаетесь удалить или<br>обновить их, "
 "сервер скорее всего сообщит о<br>конфликте.<br><br>Нажмите <strong>{1}</"
-"strong> что бы проверить состояние этих примитивов<br>на сервере.<br>Нажмите "
-"<strong>{2}</strong> что бы проигнорировать.<br></html>"
+"strong> что бы проверить состояние этих элементов<br>на сервере.<br>Нажмите "
+"<strong>{2}</strong> чтобы проигнорировать.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
 msgid "Deleted or moved primitives"
-msgstr "Удалённые или перемещённые примитивы"
+msgstr "Удалённые или перемещённые элементы"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2079,6 +2018,6 @@
 msgstr ""
 "Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять "
-"неиспользуемые точки при удалении линии. Ctrl: удалить линию, но оставить "
-"точки."
+"неиспользуемые точки при удалении линии. Ctrl: удалить соответствующие "
+"объекты."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
@@ -2120,5 +2059,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
 msgid "Add a new node to an existing way"
-msgstr "Добавить точку к линии"
+msgstr "Добавить новую точку к линии"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544
@@ -2133,5 +2072,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
-msgstr "Выбирете точко под курсором"
+msgstr "Выделить точку под курсором."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
@@ -2139,5 +2078,5 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Вставить новый узел в линию"
+msgstr[0] "Вставить новую точку в {0} линию"
 msgstr[1] "Вставить новую точку в {0} линии"
 msgstr[2] "Вставить новую точку в {0} линий"
@@ -2145,9 +2084,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
-msgstr "Начать путь с последней точки"
+msgstr "Начать новую линию с последней точки"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
-msgstr "Продолжить путь с последней точки"
+msgstr "Продолжить линию с последней точки"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
@@ -2167,5 +2106,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
 msgid "Extrude Way"
-msgstr "Выдавливание линии"
+msgstr "Выдавить линию"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
@@ -2213,7 +2152,7 @@
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Добавьте или переместите новый виртуальный узел в линию"
-msgstr[1] "Добавьте или переместите новый виртуальный узел в {0} линиях"
-msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях"
+msgstr[0] "Добавьте или переместите новую виртуальную точку на {0} линию"
+msgstr[1] "Добавьте или переместите новую  виртуальную точку на {0} линии"
+msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
@@ -2376,5 +2315,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - объект с заданным количеством узлов"
+msgstr "<b>точки:</b>... - объект с заданным количеством точек"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
@@ -2538,6 +2477,6 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
-"Неверное значение оператора точек: {0}. Оператор точек ожидает число. точек "
-"или диапазон, например, 10-20"
+"Неверное значение оператора точек: {0}. Оператор точек ожидает число точек "
+"или диапазон, например, точки:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
@@ -2557,5 +2496,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
 msgid "Downloading..."
-msgstr "Загрузка..."
+msgstr "Скачивание..."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
@@ -2574,4 +2513,74 @@
 msgid "Error while communicating with server."
 msgstr "Ошибка  связи с сервером."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Текущее число изменений превысило максимальное, текущее - {0}, максимальное "
+"- {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Нарушение возможностей API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Предупреждение: автоматическое усечение значения тэга ''{0}'' на удалённом "
+"элементе {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Длина значения 'для тега '{0}'' элемента {1} превышает максимально "
+"допустимую длину {2}. Значение длины {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Нарушение предусловия"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"точек в линии {1}: {0} шт. Это превышает максимально допустимое кол-во точек "
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Циклические зависимости между отношениями:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} отношения создали цикл, так как они ссылаются друг на друга."
+"<br>JOSM не может загрузить их на сервер. Пожалуйста, отредактируйте "
+"отношения, удалив циклические ссылки.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Отношение ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... обращается к отношению"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Циклические зависимости"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2677,6 +2686,6 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 "Предупреждение: слой ''{0}'' больше не существует. Невозможно удалить "
@@ -2698,10 +2707,10 @@
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Решите конфликт в координатах в {0}"
+msgstr "Устраните конфликт в координатах в {0}"
 
 #. should not happen
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "не могу устранить нерешенный конфликт"
 
@@ -2765,5 +2774,5 @@
 "из отношения?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Разделить сегмент линии"
@@ -2771,6 +2780,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2778,9 +2787,9 @@
 "use them.<br>Do you really want to delete?"
 msgstr ""
-"Вы собираетесь удалить точки, выходящие за скачанную зону.<br>Это может "
-"вызвать проблемы, потому что другие объекты (которых не видно) могут "
-"использовать их.<br> Вы действительно хотите удалить их?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+"Вы собираетесь удалить точки, находящиеся за пределами скачиваемой зоны."
+"<br>Это может вызвать проблемы, потому что другие объекты (которых не видно) "
+"могут использовать их.<br> Вы действительно хотите удалить эти точки?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Удалить подтверждение"
@@ -2789,5 +2798,5 @@
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Разрешить конфликт при удалении {0}"
+msgstr "Устранить конфликт при удалении {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
@@ -2801,5 +2810,5 @@
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
 msgid "Purging 1 primitive"
-msgstr "Очистка 1 примитива"
+msgstr "Очистка 1 элемента"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
@@ -2857,38 +2866,38 @@
 #, 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}"
+msgstr "Устранить {0} конфликтов тегов в отношении {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
 #, java-format
 msgid "Undelete {0} primitives"
-msgstr "Отменить удаление {0} примитивов"
+msgstr "Восстановить {0} удаленных элементов"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
 #, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr "Разрешить конфликт версий для точки {0}"
+msgstr "Устранить конфликты версий для точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
 #, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr "Разрешить конфликт версий для линии {0}"
+msgstr "Устранить конфликты версий для линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
 #, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr "Разрешить конфликты версии для отношения {0}"
+msgstr "Устранить конфликты версий для отношения {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
 msgstr "Устранить конфликты в списке точек линии {0}"
@@ -2897,5 +2906,5 @@
 #, java-format
 msgid "Main dataset does not include node {0}"
-msgstr "В основном наборе нет узла {0}"
+msgstr "Основной набор данных не содержит точку {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -3080,5 +3089,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "уже существует конфликт для примитива ''{0}''"
 
@@ -3097,18 +3106,21 @@
 msgstr "Градусы, минуты, секунды"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "Ю"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "В"
@@ -3122,43 +3134,65 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "параметр {0} должен быть > 0. Текущее значение {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr "П"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "С"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr "Текст"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "М"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgstr "И"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgstr "Р"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgstr "З"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgstr "Д"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgstr "У"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
+msgstr "В"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3174,29 +3208,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "обнаружен id >= 0. Получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr "примитив с id=0 не может быть невидимым"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr "обнаружено id > 0. Получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "обнаружена версия > 0. Получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
 
@@ -3206,6 +3241,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 "набор тэгов не может быть применен к примитиву из-за наличия ключей с "
@@ -3214,45 +3249,40 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr "невозможно добавить узел {0} к незавершённой линии {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr "В этой истории не существует примитива версии {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "более ранняя версия не найдена. История пуста."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version 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} не был найден в этом наборе данных"
+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/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''"
+msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''"
 
@@ -3260,15 +3290,15 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
-msgstr "Путь, обозначающий границу области, не закрыт."
+msgstr "Линия, обозначающая границу области, не замкнута."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
-msgstr "многополигональная линия ''{0}'' не замкнута"
+msgstr "линия ''{0}'' не замкнута"
 
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
@@ -3289,13 +3319,13 @@
 #, java-format
 msgid "Way ''{0}'' with less than two points."
-msgstr "Путь «{0}» имеет меньше двух точек."
+msgstr "Линия «{0}» имеет меньше двух точек."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
-msgstr "Найден больше чем один \"from\""
+msgstr "Обнаружена больше чем одна линия \"от\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
-msgstr "Найден больше чем один \"to\""
+msgstr "Обнаружено больше одной линии \"до\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
@@ -3317,29 +3347,29 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
-msgstr "Не найден путь \"from\""
+msgstr "Не найдена линия \"от\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
-msgstr "Не найден путь \"to\""
+msgstr "Не найдена линия \"до\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
-msgstr "Не найдена \"via\" точка или путь"
+msgstr "Не найдена точка или линия \"через\""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке."
+msgstr "Линия \"от\" не начинается или заканчивается на точке \"через\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке."
+msgstr "Линия \"до\" не начинается и не заканчивается на точке \"через\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути."
+msgstr "Линия \"от\" не начинается и не заканчивается на линии \"через\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути."
+msgstr "Линия \"до\" не начинается и не заканчивается на линии \"через\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
@@ -3351,35 +3381,35 @@
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr "Нет полезного значения ''{0}'' для пути ''{1}''."
+msgstr "Нет полезной роли ''{0}'' для пути ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "не-линия ''{0}'' в мультиполигональном отношении"
+msgstr "не-линия ''{0}'' в области"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
-msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
+msgstr "Для области «{0}» отсутствует внешняя линия."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
+msgstr "Персечение между линиями ''{0}'' и ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
-msgstr "Внутренний путь «{0}» находится снаружи."
+msgstr "Внутренняя линия «{0}» находится снаружи."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном."
+msgstr "Стиль для внутренней линии ''{0}'' одинаков с областью."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr "Стиль для внешней границы ''{0}'' отсутствует."
+msgstr "Стиль для внешней линии ''{0}'' отсутствует."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
@@ -3400,7 +3430,7 @@
 "Keeping my primitive. "
 msgstr ""
-"Мой примитив с id {0} и версией {1} видим, хотя их примитив с более низкой "
-"версией {2} невидим. Не могут справиться с этой непоследовательности. "
-"Сохраняю мой примитив. "
+"Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
+"низкой версией {2} невидим. Невозможно справиться с этой несовместимостью. "
+"Сохраняю мой элемент. "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
@@ -3411,15 +3441,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
 msgid_plural "nodes"
-msgstr[0] "узел"
-msgstr[1] "узла"
-msgstr[2] "узлов"
+msgstr[0] "точка"
+msgstr[1] "точки"
+msgstr[2] "точек"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3431,5 +3461,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3441,5 +3471,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
 msgid "untagged way"
-msgstr "линия без тэгов"
+msgstr "линия без тегов"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
@@ -3463,5 +3493,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
@@ -3473,9 +3503,9 @@
 "and start a new layer on the new zone."
 msgstr ""
-"ВАЖНО : данных расположены слишком далеко от\n"
-"текущих границ Lambert зоны.\n"
-"Не загружайте никаких данны после этого сообщения.\n"
-"Отмените ваше последнее действие, сохраните вашу работу\n"
-"и начните новый слой в новой зоне."
+"ВАЖНО : данные расположены слишком\n"
+"далеко от текущих границ Lambert зоны.\n"
+"Не загружайте пока никаких данных .\n"
+"Отмените последнее действие, сохраните\n"
+"данные и начните новый слой в новой зоне."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
@@ -3502,13 +3532,13 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
@@ -3551,5 +3581,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
-msgstr "водоёмы"
+msgstr "водоём"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
@@ -3607,5 +3637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
 msgid "Primitive already deleted"
-msgstr "Примитив уже удален"
+msgstr "Элемент уже удален"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3615,10 +3645,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
-msgstr "Загружается \"Сообщение дня\""
+msgstr "Скачивается \"Сообщение дня\""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload Preferences"
-msgstr "Параметры загрузки"
+msgstr "Загрузить параметры"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3746,5 +3776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr "/путь/до/каталога/JOSM/         "
+msgstr "/PATH/TO/JOSM/FOLDER/         "
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
@@ -3922,9 +3952,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
 msgid "User:"
-msgstr ""
+msgstr "Пользователь:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
@@ -3987,5 +4017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "роль {0} не участвует в паре сравнения {1}"
 
@@ -4019,5 +4049,5 @@
 #: ../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
@@ -4029,9 +4059,9 @@
 #, 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
 msgid "Nodes(resolved)"
-msgstr "Точки(решённые)"
+msgstr "Точки (без конфликтов)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4039,18 +4069,18 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
-"Сведённый список узлов заморожен. Нет неразрешённых конфликтов в списке "
-"узлов этого пути"
+"Список объединённых точек заморожен. Нет неулаженных конфликтов в списке "
+"точек этой линии"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
-msgstr "Узлы(с конфликтами)"
+msgstr "Точки (с конфликтами)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
-msgstr "Неустранённые конфликты в списке узлов этого пути"
+msgstr "Неустранённые конфликты в списке точек этой линии"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
-msgstr "Члены(разрешённые)"
+msgstr "Члены (без конфликтов)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
@@ -4080,5 +4110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
-msgstr "Конфликты свойств ожидающие устранения"
+msgstr "Конфликты свойств, ожидающие устранения"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
@@ -4089,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 "текущее значение параметра вне допустимой области: текущее значение {0}"
@@ -4096,15 +4126,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "пункт {0} не найден в списке"
 
@@ -4155,5 +4185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Скопировать выделенные узлы в начало объединённого списка узлов"
+msgstr "Скопировать выделенные точки в начало списка объединённых точек"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
@@ -4162,5 +4192,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "Скопировать выделенные элементы в конец объединённого списка элементов"
 
@@ -4168,5 +4198,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Скопировать выделенные элементы перед первым выделенным элементом в "
@@ -4176,5 +4206,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Скопировать мои выделенные элементы после первого выделенного элемента в "
@@ -4182,10 +4212,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Скопировать их выделенные элементы в конец объединённого списка элементов"
@@ -4194,5 +4225,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Скопировать их выделенные элементы перед первым выделенным элементом в "
@@ -4213,5 +4244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Поднять выделенные элементы на одну позицию"
 
@@ -4222,5 +4253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Опустить выделенные элементы на одну позицию"
 
@@ -4235,5 +4266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Удалить выделенные записи из объединённого списка элементов"
 
@@ -4245,5 +4276,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Зафиксировать текущий объединённый список элементов"
 
@@ -4253,5 +4284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 "Отменить фиксирование объединённого списка элементов и начать объединение"
@@ -4260,5 +4291,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Нажмите <strong>{0}</strong> что бы начать объединение моих и их "
@@ -4268,5 +4300,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4302,6 +4334,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4309,5 +4341,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4317,5 +4349,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4323,5 +4355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4355,11 +4387,11 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 msgstr ""
-"<html>Существует {0} дополнительных узлов используемых треком  {1} <br>, "
-"которые удалены на сервере. <br><br> Вы хотите восстановить эти узлы тоже?</"
+"<html>Существует {0} дополнительных точек используемых треком {1} <br>, "
+"которые удалены на сервере. <br><br> Вы хотите восстановить эти точки тоже?</"
 "html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477
 msgid "Undelete additional nodes?"
-msgstr "Восстановить дополнительные узлы?"
+msgstr "Восстановить дополнительные точки?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
@@ -4370,5 +4402,5 @@
 "</html>"
 msgstr ""
-"<html>Существуют дополнительне элементы ( {0} шт.), связанные с отношением "
+"<html>Существуют дополнительные элементы ( {0} шт.), связанные с отношением "
 "{1}<br>, которые удалены с сервера. <br><br>Вы хотите восстановить их тоже?</"
 "html>"
@@ -4376,5 +4408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
-msgstr "Восстановить связанные примитивы?"
+msgstr "Восстановить связанные элементы?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
@@ -4506,5 +4538,5 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM будет должен удалить ваш локальный примитив с id {0}<br>из набора "
+"<html>JOSM будет должен удалить ваш локальный элемент с id {0}<br>из набора "
 "данных.<br>Вы согласны?</html>"
 
@@ -4528,9 +4560,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
 msgid "Primitive"
-msgstr "Примитив"
+msgstr "Элемент"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgstr ""
+"Объединённые точки ещё не заморожены. Невозможно построить команду разборки"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
@@ -4590,5 +4623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "Не могу принять неопределённое объединение тегов"
 
@@ -4596,5 +4629,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
 
@@ -4636,15 +4669,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Конфликты при объединении элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Возникли конфликты при объединении линий - полученная линия: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
+msgstr "Конфликт при слиянии точек - объединённая точка ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
@@ -4655,10 +4688,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Прекратить разрешение конфликтов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Применить устранённые конфликты"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
@@ -4704,14 +4737,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "параметр ''{0}'' не должен быть пустым"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "набор тегов не содержит выделенное значение ''{0}''"
 
@@ -4720,7 +4753,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr "Ещё не решено"
 
@@ -4788,5 +4819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4810,4 +4841,9 @@
 msgid "Undecided"
 msgstr "Нерешённый"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
+msgstr "Ещё не решено"
 
 #. --- role editing
@@ -4836,9 +4872,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Поз."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Исх. линия"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
@@ -4891,5 +4927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
 msgid "Resolve"
-msgstr "Разрешить"
+msgstr "Устранить"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
@@ -4936,18 +4972,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
 msgid "Conflict not resolved completely"
-msgstr "Конфликт не был полностью разрешён"
+msgstr "Конфликт устранён не полностью"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
 msgid "Resolve conflicts"
-msgstr "Устранить конфликт"
+msgstr "Устранить конфликты"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr "Разрешить конфликты для ''{0}''"
+msgstr "Устранить конфликты для ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Отфильтровать объекты и скрыть/отключить их."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
@@ -4962,5 +4998,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4969,41 +5005,41 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Добавить фильтр."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Редактировать фильтр."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Удалить фильтр."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Переместить фильтр вверх."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Переместить фильтр вниз."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Включить фильтр"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Скрыть элементы"
 
 #: ../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
 msgid "Inverse filter"
-msgstr ""
+msgstr "Инвертировать фильтр"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Режим фильтра"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -5018,5 +5054,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
 
@@ -5026,5 +5062,5 @@
 #, java-format
 msgid "Node {0}"
-msgstr "Узел {0}"
+msgstr "Точка {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
@@ -5054,5 +5090,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Показать историю выделенного примитива"
 
@@ -5123,5 +5159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<различные>"
@@ -5198,5 +5234,5 @@
 #, java-format
 msgid "Really delete selection from relation {0}?"
-msgstr "Удалить выделение из отношения {0}?"
+msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855
@@ -5241,5 +5277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Создать копию этих отношений и открыть их в другом окне"
+msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5267,5 +5303,5 @@
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr "Отн.:{0} / Путей:{1} / Точек:{2}"
+msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
@@ -5315,5 +5351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
 msgid "Select primitives submitted by this user"
-msgstr "Выбрать примитивы, созданные этим пользователем"
+msgstr "Выбрать элементы, созданные этим пользователем"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
@@ -5353,23 +5389,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
 #: ../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
 msgid "Download selected relations"
-msgstr ""
+msgstr "Скачать выбранные отношения"
 
 #: ../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
@@ -5377,5 +5412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
-msgstr ""
+msgstr "Скачать участников отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
@@ -5390,8 +5425,10 @@
 "loaded"
 msgstr ""
+"<html>Наследник отношения<br>{0}<br>удален с сервера. Он не может быть "
+"загружен"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352
 msgid "Relation is deleted"
-msgstr ""
+msgstr "Отношение удалено"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
@@ -5399,10 +5436,9 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr "Скачивается отношение {0}"
+msgstr "Скачивание отношения {0}"
 
 #: ../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:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5416,9 +5452,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
-msgstr ""
+msgstr "Отношения родителя"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
-msgstr ""
+msgstr "Отношения наследника"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
@@ -5432,5 +5468,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Удалить их, почистить отношение"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
@@ -5445,8 +5481,11 @@
 "html>"
 msgstr ""
+"<html>В этом отношение уже есть один или более членов, относящихся "
+"к<br>элементу ''{0}''<br><br>Вы действительно хотите добавить другого члена "
+"отношения?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
-msgstr ""
+msgstr "Несколько членов, относящихся к одному и тому же элементу"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
@@ -5462,5 +5501,5 @@
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
-"Добавить все примитивы, выделенные в текущем наборе данных, перед первым "
+"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
 "членом"
 
@@ -5469,5 +5508,5 @@
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
-"Добавить все примитивы, выделенные в текущем наборе данных, после последнего "
+"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
 "члена"
 
@@ -5477,5 +5516,5 @@
 "member"
 msgstr ""
-"Добавить все примитивы, выделенные в текущем наборе данных, перед первым "
+"Добавить все элементы, выделенные в текущем наборе данных, перед первым "
 "выделенным членом"
 
@@ -5485,10 +5524,10 @@
 "member"
 msgstr ""
-"Добавить все примитивы, выделенные в текущем наборе данных, после последнего "
+"Добавить все элементы, выделенные в текущем наборе данных, после последнего "
 "выделенного члена"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
+msgstr "Удалить всех членов, относящихся к каждому из выделенных элементов"
 
 #. putValue(NAME, tr("Remove Selected"));
@@ -5501,5 +5540,5 @@
 msgid ""
 "Select relation members which refer to primitives in the current selection"
-msgstr ""
+msgstr "Выделить членов отношения, которые относятся к выбранным элементам"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
@@ -5509,8 +5548,10 @@
 "selection"
 msgstr ""
+"Выделить членов отношения, которые относятся к {0} элем. среди выделенных "
+"элементов"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
-msgstr ""
+msgstr "Выделить элементы для выделенных членов отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
@@ -5579,4 +5620,6 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
+"<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
+"<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
@@ -5598,5 +5641,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
-msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
+msgstr "Скачать недостающие части линий и точки, участвующие в отношении"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
@@ -5623,4 +5666,7 @@
 "new role?</html>"
 msgstr ""
+"<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
+"ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
@@ -5636,4 +5682,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Выбранный, при редактировании отношения,  участник относится к"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5643,5 +5693,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
 msgid "Zoom to primitive the first selected member refers to"
-msgstr ""
+msgstr "Масштабировать элемент, к которому относится первый выделенный член"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
@@ -5663,14 +5713,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
-msgstr ""
+msgstr "Скачать ссылающиеся отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
 #: ../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
@@ -5754,5 +5809,5 @@
 "area)"
 msgstr ""
-"URL с www.openstreetmap.org (вы можете вставить URL сюда чтобы загрузить "
+"URL с www.openstreetmap.org (вы можете вставить URL сюда чтобы скачать "
 "область)"
 
@@ -5915,10 +5970,10 @@
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "История точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "История линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
@@ -5936,5 +5991,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5942,19 +5997,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5963,18 +6022,13 @@
 msgstr "Загрузить историю"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Скачивание истории для точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Скачивание истории линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
@@ -6968,4 +7022,5 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"В слое ''{0}'' есть изменения, которые должны быть загружены на сервер."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
@@ -6973,4 +7028,5 @@
 msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
+"В слое ''{0}'' нет изменений, которые надо было бы загрузить на сервер."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
@@ -7008,5 +7064,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Выбрать, чтобы загрузить слой ''{0}'' на сервер ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -7018,12 +7074,16 @@
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
+"Несохранённые изменения - Сохранить локально или загрузить на сервер перед "
+"выходом?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 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
@@ -7036,5 +7096,12 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>{0} слой содержит неустранённые конфликты.<br>Либо сначала устраните "
+"их, либо отмените изменения.<br>Слой с конфликтами:</html>"
 msgstr[1] ""
+"<html>{0} слоя содержат неустранённые конфликты.<br>Либо сначала устраните "
+"их, либо отмените изменения.<br>Слои с конфликтами:</html>"
+msgstr[2] ""
+"<html>{0} слоёв содержат неустранённые конфликты.<br>Либо сначала устраните "
+"их, либо отмените изменения.<br>Слои с конфликтами:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
@@ -7079,4 +7146,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Отменить и выйти"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7091,7 +7162,13 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+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
@@ -7102,9 +7179,10 @@
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
+"Слои сохранить локально или загрузить на сервер. Изменения не будут потеряны."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
+msgstr "Подготовка слоя ''{0}'' для загрузки на сервер..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
@@ -7113,8 +7191,10 @@
 "cancelled or has been failed.</html>"
 msgstr ""
+"<html>Операция загрузки на сервер или сохранения одного изменённого "
+"слоя<br>была отменена или не удалась.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Неполная загрузка на сервер или не всё сохранено"
 
 #. item "Streets/Motorway" text "Name"
@@ -7174,5 +7254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Следует загрузить на сервер?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
@@ -7187,5 +7267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
-msgstr ""
+msgstr "Загрузить на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
@@ -7238,27 +7318,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
-msgstr "Загрузить изменения"
+msgstr "Загрузить изменения на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Загрузить на сервер изменённые элементы"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
-"Пожалуйста, введите комментарий для этой загрузки пакета изменений (мин. 3 "
-"символа)"
+"Пожалуйста, введите комментарий для этой загрузки на сервер пакета изменений "
+"(мин. 3 символа)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "неверный комментарий загрузки на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Отменить загрузку на сервер и продолжить редактирование"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 msgid "Upload all changes in one request"
-msgstr ""
+msgstr "Загрузить все изменения на сервер одним запросом"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
@@ -7267,10 +7347,10 @@
 "changed primitive"
 msgstr ""
-"Включите, чтобы выгрузить все изменения за один запрос, отключите, чтобы "
-"делать отдельный запрос для каждого изменённого примитива"
+"Включите, чтобы загрузить на сервер все изменения за один запрос или "
+"отключите, чтобы делать отдельный запрос для каждого изменённого элемента"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
 msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишите изменения для закачиваемых данных:"
+msgstr "Прокомментируйте данные, загружаемые на сервер:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
@@ -7280,5 +7360,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 msgid "Open a new changeset and use it in the next upload"
-msgstr "Открыть новый пакет изменений и использовать его в следующей загрузке"
+msgstr ""
+"Открыть новый пакет изменений и использовать его в следующей загрузке на "
+"сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
@@ -7288,13 +7370,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
 msgid "Upload data to an already opened changeset"
-msgstr "Загрузить данные в уже открытый пакет изменений"
+msgstr "Загрузить данные на сервер в уже открытый пакет изменений"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
 msgid "Close changeset after upload"
-msgstr "Закрыть пакет изменений после загрузки"
+msgstr "Закрыть пакет изменений после загрузки на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
 msgid "Select to close the changeset after the next upload"
-msgstr "Выбрать, какой пакет изменений надо закрыть, после следующей загрузки"
+msgstr ""
+"Выбрать, какой пакет изменений надо закрыть, после следующей загрузки на "
+"сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
@@ -7315,11 +7399,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
-msgstr "обнаружен идентификатор пакета изменений > 0. Получено {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
+msgstr "требуется идентификатор пакета изменений > 0. Получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Подготовка элементов к загрузке на сервер ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7431,36 +7518,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "точка GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7468,5 +7555,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7475,5 +7562,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7508,4 +7595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7566,5 +7654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
@@ -7575,9 +7663,9 @@
 "<br>If you want to upload traces, look here:"
 msgstr ""
-"<html>Загрузка на карту необработанных данных GPS считается вредоносной."
-"<br>Если хотите загрузить трэк, сделайте это по ссылке:"
+"<html>Загрузка на сервер необработанных данных GPS под видом данных карты "
+"считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7585,5 +7673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7596,5 +7684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
-msgstr "Скачать с JSM данные вдоль трэка"
+msgstr "Скачать с OSM данные вдоль этого трека"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
@@ -7627,5 +7715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
-msgstr ""
+msgstr "Скачать данные"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
@@ -7692,35 +7780,21 @@
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+"<html>Загрузка на сервер необработанных данных GPS под видом данных карты "
+"считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "трек"
-msgstr[1] "треки"
-msgstr[2] "треков"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7729,5 +7803,5 @@
 msgstr[2] "точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7737,5 +7811,5 @@
 msgstr[2] "трек с {0} точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7745,5 +7819,5 @@
 msgstr[2] "{0} состоит из {1} треков"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7881,5 +7955,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Пожалуйста, выберите ряд для редактирования."
@@ -7895,5 +7969,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7985,5 +8059,5 @@
 "waypoints) with names or descriptions."
 msgstr ""
-"Автоматически создавать звуковые метки из узлов трека (вместо точных "
+"Автоматически создавать звуковые метки из точек трека (вместо точных "
 "маршрутных точек) с именами или описаниями"
 
@@ -8078,4 +8152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8226,5 +8301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
-msgstr "Отображать виртуальные точки в режиме выделения"
+msgstr "Отображать виртуальные точки в режиме выбора"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
@@ -8335,5 +8410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
-msgstr "Показывать порядковые номера на всех сегментах пути."
+msgstr "Показывать порядковые номера на всех сегментах линии."
 
 #. antialiasing
@@ -8634,5 +8709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Удалить источник из списка."
@@ -8842,33 +8917,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Подробнее"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Использовать шаблон ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "замкнутая"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8879,15 +8955,15 @@
 msgstr "Не удалось прочитать помеченные настройки исходника: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8898,18 +8974,18 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Ничего не выбрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Элементы выбраны неверно!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Применить шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Изменить параметры"
@@ -8937,11 +9013,5 @@
 #, java-format
 msgid "Downloading points {0} to {1}..."
-msgstr "Загрузка точек с {0} до {1}..."
-
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
+msgstr "Скачивание точек с {0} до {1}..."
 
 #. SAXException does not chain correctly
@@ -8956,11 +9026,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Невозможно прочитать \"{0}\""
 
@@ -8970,6 +9039,6 @@
 "tracks."
 msgstr ""
-"Внимание: GPL несовместима с лицензией OSM. Не загружайте треков, "
-"лицензированных под GPL"
+"Внимание: GPL несовместима с лицензией OSM. Не загружайте на сервер треки, "
+"лицензированные под GPL"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
@@ -8979,5 +9048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "описание трека GPS"
 
@@ -9041,5 +9110,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -9052,5 +9120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ошибка разбора: неправильная структура документа gpx"
 
@@ -9062,5 +9130,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -9077,5 +9145,5 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Извлечение точки с id {0} из ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
@@ -9097,5 +9165,5 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Извлечение пакета точек из ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
@@ -9112,5 +9180,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Сервер выдал ошибку 404, повторная попытка индивидуальными запросам для "
@@ -9152,5 +9220,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi"
 
@@ -9170,5 +9238,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Соединение с {0} установлено используя протокол {1}"
 
@@ -9176,5 +9244,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\""
 
@@ -9182,5 +9250,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "неожиданный формат новой версии изменённого примитива \"{0}\", текущее "
@@ -9196,10 +9264,4 @@
 msgstr "Успешно открытый пакет изменений {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr "требуется идентификатор пакета изменений > 0. Получено {0}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9216,5 +9278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Нет пакетов изменений для загрузки отличий"
 
@@ -9225,5 +9287,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
-msgstr "Закачка..."
+msgstr "Загрузка на сервер..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
@@ -9246,22 +9308,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
-msgstr "текущий набор изменений пуст. Невозможно загрузить данные."
+msgid "Current changeset is null. Can't upload data."
+msgstr "Текущий пакет изменений пуст. Невозможно загрузить данные."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-"требуется идентификатор текущего пакета изменений > 0. Текущий идентификатор "
-"{0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
-msgstr "Требуемый дентификатор пакета изменений > 0. Получено {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 "Требуется открытый пакет изменений. Получен закрытый пакет изменений с "
@@ -9276,5 +9331,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Сервер возвратил ошибку с кодом {0}"
 
@@ -9291,7 +9346,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "обязательный атрибут ''{0}'' отсутствует"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9301,15 +9362,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9317,11 +9378,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9340,5 +9395,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9415,9 +9470,9 @@
 #, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr ""
+msgstr "Ожидался экземпляр OsmDataLayer. Получено ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr "<html>Произошла ошибка при сохранении.<br>Ошибка: <br>{0}</html>"
 
@@ -9425,5 +9480,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9441,15 +9496,8 @@
 msgstr "Файлы сервера OSM сжаты с помощью gzip"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "обязательный атрибут ''{0}'' отсутствует"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
@@ -9459,5 +9507,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
@@ -9466,5 +9515,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
@@ -9474,5 +9523,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее "
@@ -9482,5 +9531,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
@@ -9490,6 +9539,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
@@ -9504,32 +9553,37 @@
 msgstr "Ошибка при разборе."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Файл \"{0}\" не существует"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9541,5 +9595,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9560,5 +9614,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Недопустимый объект с id=0"
 
@@ -9567,26 +9621,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9594,10 +9637,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9605,9 +9648,9 @@
 #, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr ""
+msgstr "Отсутствует нужный атрибут ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9615,5 +9658,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9621,6 +9664,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9628,5 +9671,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9635,5 +9678,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9652,19 +9695,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Скачивание зависимых линий ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
 msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Скачивание зависимых отношений..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
@@ -9674,5 +9712,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr "Скачка пакетов изменений ..."
+msgstr "Скачивание пакетов изменений ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
@@ -9684,14 +9722,14 @@
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr "Скачка пакета изменений {0} ..."
+msgstr "Скачивание пакета изменений {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
 msgid "Downloading history..."
-msgstr "Загрузка истории..."
+msgstr "Скачивание истории..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
@@ -9701,5 +9739,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Не удалось установить соединение с API {0}"
 
@@ -9710,5 +9748,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше интернет-"
@@ -9716,5 +9754,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9724,5 +9762,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9732,10 +9770,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "Начало загрузки на сервер с отдельным запросом на каждый элемент ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
@@ -9743,4 +9781,5 @@
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
+"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер точки ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
@@ -9748,17 +9787,18 @@
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
+"{0}% ({1}/{2}), {3} осталось. Загрузка на сервер линии ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка отношения ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Начало загрузки на сервер за один запрос..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Загрузка данных на сервер ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
@@ -9767,9 +9807,11 @@
 "0.6"
 msgstr ""
+"Предупреждение: нет версии API предназначенной для загрузки данных на "
+"сервер. Возврат к версии 0.6"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9800,29 +9842,29 @@
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] "{0} Плагин успешно загружен. Пожалуйста, перезагрузите JOSM."
-msgstr[1] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM."
-msgstr[2] "{0} Плагины успешно загружены. Пожалуйста, перезагрузите JOSM."
+msgstr[0] "{0} Модуль успешно скачен. Пожалуйста, перезагрузите JOSM."
+msgstr[1] "{0} Модули успешно загружены. Пожалуйста, перезагрузите JOSM."
+msgstr[2] "{0} Модули успешно загружены. Пожалуйста, перезагрузите JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr "Загрузка Плагина {0}..."
+msgstr "Скачивание модуля {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
-msgstr "Пропустить загрузку"
+msgstr "Пропустить скачивание"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 msgid "Download Plugin"
-msgstr "Загрузить Плагин"
+msgstr "Скачать модуль"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 msgid "Skip Download"
-msgstr "Пропустить Загрузку"
+msgstr "Пропустить скачивание"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
-msgstr "JOSM версии {0} требует плагин {1}."
+msgstr "JOSM версии {0} нужен модуль {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -9834,5 +9876,5 @@
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr ""
+msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90
@@ -10061,5 +10103,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57
 msgid "Unexpected Exception"
-msgstr "Неожиданная ошибка"
+msgstr "Неожиданное исключение"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
@@ -10116,5 +10158,5 @@
 "html>"
 msgstr ""
-"<html><strong>Ошибка</strong> выгрузки данных на сервер, так как  ваши "
+"<html>Загрузка на сервер <strong>не удалась</strong>, так как ваши "
 "данные<br> противоречат обязательным условиям.<br> Сообщение об ошибке: <br>"
 "{0}</html>"
@@ -10146,6 +10188,6 @@
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
-"<html>Невозможно загрузить или скачать данные<br>''{0}''<br>из-за проблемы "
-"передачи данных.<br>Подробнее: {1}</html>"
+"<html>Невозможно загрузить на сервер или скачать данные<br>''{0}''<br>из-за "
+"проблемы передачи данных.<br>Подробнее: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
@@ -10169,4 +10211,7 @@
 "community."
 msgstr ""
+"Область, которую вы хотите скачать слишком велика или запрошено слишком "
+"много данных.<br>Выделите меньшую область или воспользуйтесь другими "
+"средствами экспорта файлов OSM."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10193,9 +10238,9 @@
 "<br>{0}</html>"
 msgstr ""
-"<html><strong>Ошибка</strong>при выгрузке данных, примитив который вы "
-"пытаетесь удалить <br>уже удаленн с сервера.<br><br>Сообщение об ошибке:<br>"
-"{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+"<html>Загрузка на сервер <strong>не удалась</strong>, потому что элемент, "
+"который вы пытались удалить <br>уже удален с сервера.<br><br>Сообщение об "
+"ошибке:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10267,5 +10312,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10274,5 +10319,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10281,5 +10326,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10288,5 +10333,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10295,5 +10340,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10309,13 +10354,13 @@
 msgstr ""
 "Формировать сетку линий основанную на двух существующих линиях, которые "
-"имеют различные узлы и один общий"
+"имеют различные точки и одну общую"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
 msgid "Select two ways with a node in common"
-msgstr "Выберите две линии, с общим узлом"
+msgstr "Выберите две линии, с общей точкой"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
 msgid "Select two ways with alone a node in common"
-msgstr "Выберите два пути с единственным общим узлом"
+msgstr "Выберите две линии с единственной общей точкой"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
@@ -10343,5 +10388,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
 msgid "Upload Trace"
-msgstr "Загрузка трэка"
+msgstr "Загрузка трека на сервер"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117
@@ -10349,5 +10394,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 msgid "Upload Traces"
-msgstr "Загрузка трэков"
+msgstr "Загрузка треков на сервер"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
@@ -10391,22 +10436,22 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
-msgstr "Загрузка отменена"
+msgstr "Загрузка на сервер отменена"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
 msgid "Error while uploading"
-msgstr "Ошибка во время загрузки"
+msgstr "Ошибка во время загрузки на сервер"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 msgid "GPX upload was successful"
-msgstr "Загрузка GPX успешно закончена"
+msgstr "Загрузка GPX на сервер успешно завершена"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "Upload failed. Server returned the following message: "
-msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: "
+msgstr "Загрузка на сервер не удалась. Сервер вернул следующее сообщение: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr "Загрузка GPX трэка: {0}% ({1} из {2})"
+msgstr "Загрузка GPX трека на сервер: {0}% ({1} из {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
@@ -10417,5 +10462,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
 msgid "No GPX layer selected. Cannot upload a trace."
-msgstr "Слой GPX не выбран. Не удается загрузить трэк."
+msgstr "Слой GPX не выбран. Не удается загрузить трек на сервер."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
@@ -10429,9 +10474,138 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
-msgstr "Загрузка GPX трэка"
+msgstr "Загрузка GPX трека на сервер"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 msgid "Uploads traces to openstreetmap.org"
-msgstr "Загрузка трэков на сайт openstreetmap.org"
+msgstr "Загрузка треков на сайт openstreetmap.org"
+
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Интерполяция адресов"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Нечетные"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Четные"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr "Будет присоединено {0} дополнительных точек номеров домов"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -10551,4 +10725,9 @@
 msgid "Error while parsing {0}"
 msgstr "Ошибка разбора {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Невозможно прочитать \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10844,13 +11023,13 @@
 msgstr "Выбрать из..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10859,13 +11038,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10887,5 +11066,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Draw boundaries of downloaded data."
-msgstr "Нарисовать границы загруженных данных."
+msgstr "Нарисовать границы скачанных данных."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
@@ -10911,10 +11090,10 @@
 "by this plugin."
 msgstr ""
-"Особый обработчик на французском кадастр WMS сервете на www.cadastre.gouv.fr "
-"<BR> <BR> Пожалуйста, прочитайте условия использования здесь (по-"
-"французски): <br> <A HREF = \"http://www. cadastre.gouv.fr/scpc/html/"
+"Особый обработчик французского кадастра WMS на www.cadastre.gouv.fr <BR> "
+"<BR> Пожалуйста, прочитайте условия использования здесь (по-французски): "
+"<br> <A HREF = \"http://www. cadastre.gouv.fr/scpc/html/"
 "CU_01_ConditionsGenerales_fr.html \"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html </A> <BR> до загрузки каких-либо данных, "
-"созданный этим плагином ."
+"CU_01_ConditionsGenerales_fr.html </A> <BR> до загрузки на сервер каких-либо "
+"данных, созданный этим модулем."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66
@@ -10957,5 +11136,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Нарисовать прямоугольник вокруг загруженных данных с сервера WMS."
+msgstr "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS."
 
 #. the vectorized images multiplier
@@ -11000,5 +11179,5 @@
 #, java-format
 msgid "Downloading {0}"
-msgstr "Загружается {0}"
+msgstr "Скачивается {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
@@ -11067,5 +11246,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 msgid "Download Image from French Cadastre WMS"
-msgstr "Загрузить изображение с французского Cadastre WMS"
+msgstr "Скачать изображение с французского Cadastre WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
@@ -11095,4 +11274,6 @@
 "(two points required)"
 msgstr ""
+"Отметьте первый угол для обрезки изображения\n"
+"(Требуется отметить две точки)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
@@ -11213,7 +11394,7 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Упростить линию (удален {0} узел)"
-msgstr[1] "Упростить линию (удалено {0} узлов)"
-msgstr[2] "Упростить линию (удалено {0} узлов)"
+msgstr[0] "Упростить линию (удалить {0} точку)"
+msgstr[1] "Упростить линию (удалить {0} точки)"
+msgstr[2] "Упростить линию (удалить {0} точек)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -11221,5 +11402,5 @@
 #, java-format
 msgid "Download WMS tile from {0}"
-msgstr "Скачать фрагмент WMS из {0}"
+msgstr "Скачать квадрат карты WMS из {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
@@ -11237,28 +11418,28 @@
 msgstr "Пустой слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "слой WMS  ({0}), {1} фрагмент(ы) загружен(ы)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Векторизован."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11269,14 +11450,14 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, 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:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
@@ -11648,5 +11829,5 @@
 #, java-format
 msgid "{0} nodes so far..."
-msgstr "найдено {0} точек..."
+msgstr "{0} точек на данный момент..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51
@@ -11791,5 +11972,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of nodes in initial trace"
-msgstr "Максимальное количество узлов на начальном трэке"
+msgstr "Максимальное количество точек на начальном треке"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
@@ -11811,9 +11992,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Shift all traces to east (degrees)"
-msgstr "перевод всех трэков на восток (градусы)"
+msgstr "Сдвинуть все треки на восток (градусы)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to north (degrees)"
-msgstr "перевод всех трэков на север (градусы)"
+msgstr "Сдвинуть все треки на север (градусы)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
@@ -11823,5 +12004,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
@@ -11851,5 +12032,5 @@
 "lines). Default 50000."
 msgstr ""
-"Максимальное количество узлов сгенерированых перед очисткой (до упрощения "
+"Максимальное количество точек, сгенерированных перед очисткой (до упрощения "
 "линий). По умолчанию 50000."
 
@@ -11898,6 +12079,6 @@
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
-"Назначить линии тэг вода, берега, земли или ничего. По умолчанию, является "
-"вода."
+"Назначить тег на линии: water (вода), coastline (берега), land (земли) или "
+"ничего. По умолчанию - вода."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
@@ -11927,5 +12108,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
 msgid "Downloading image tile..."
-msgstr "Скачивается квадрат изображения..."
+msgstr "Скачивается изображение квадрата карты..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
@@ -11989,5 +12170,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Capture GPS Track"
-msgstr "Захват пути GPS"
+msgstr "Захват трека GPS"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
@@ -12032,5 +12213,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
 msgid "Reset current measurement results and delete measurement path."
-msgstr "Обнулить результаты измерений и удалить измерительный путь."
+msgstr "Обнулить результаты измерений и удалить измерительную линию."
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:79
@@ -12052,5 +12233,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95
 msgid "Angle between two selected Nodes"
-msgstr "Угол между двумя выбранными точками"
+msgstr "Угол между двумя выделенными точками"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:60
@@ -12085,19 +12266,19 @@
 #, java-format
 msgid "{0} extrem nodes."
-msgstr ""
+msgstr "{0} экстремальных точек."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
 #, java-format
 msgid "Via node {0}, {1}"
-msgstr ""
+msgstr "Через точку {0}, {1}"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
 #, java-format
 msgid "{0} via nodes."
-msgstr ""
+msgstr "{0} через точки."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
+msgstr "Невозможно найти через точки. Пожалуйста, проверьте, что вы выбрали"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
@@ -12151,6 +12332,6 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>Выбранная область содержат данные из OpenStreetBugs.<br>Невозможно "
-"загрузить эти данные. Возможно, выбран неверный слой."
+"<html>Выбранная область содержит данные из OpenStreetBugs.<br>Невозможно "
+"загрузить эти данные. Возможно, выбран неверный слой?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -12178,5 +12359,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr "Открывает окно OpenStreetBugs  и активирует автоматическую загрузку"
+msgstr "Открывает окно OpenStreetBugs и активирует автоматическое скачивание"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
@@ -12340,5 +12521,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "Пультом управления было предложено создать новую точку."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12387,5 +12568,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Открыть список узлов маршрутизации"
+msgstr "Открыть список точек маршрута"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
@@ -12635,5 +12816,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr "неожиданный номер колонки {0}"
+msgstr "неожиданный номер столбца {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -12681,18 +12862,9 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:130
 msgid "Select a single, closed way of at least four nodes."
-msgstr "Выберите одину, замкнутую линию по крайней мере из четырех узлов."
+msgstr "Выберите одну замкнутую линию, содержащую, не менее четырёх точек."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:199
 msgid "Terrace"
 msgstr "Ряд домов вдоль улицы"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Четные"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Нечетные"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
@@ -12718,41 +12890,4 @@
 msgstr "Необъязательно"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Пользователь"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Показать панель автора"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Открыть страницу пользователя"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Открыть страницу пользователя в браузере"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Выбрать данные пользователя"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Заменить выбранное данными пользователя"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Пожалуйста, выберите данные"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Пожалуйста, выберите пользователя в панели авторов"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Извините, для анонимных пользователей это недоступно"
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
@@ -12779,7 +12914,7 @@
 "Are you really sure to continue?"
 msgstr ""
-"Выбранный путь содержит точки, находящиеся за пределами \n"
-"загруженной области. Спрямление пути может быть неточным.\n"
-"Действительно продолжить?"
+"Выбранные линии содержат точки, находящиеся за пределами\n"
+"скачанной области. Некоторые точки могут быть случайно\n"
+"удалены. Вы действительно хотите продолжить?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
@@ -12800,5 +12935,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
 msgid "Added node on all intersections"
-msgstr "Добавлены узлы на всех пересечениях"
+msgstr "Добавлены точки на всех пересечениях"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
@@ -12907,5 +13042,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83
 msgid "Please select at least one way to simplify."
-msgstr "Выберите хотя бы один путь для упрощения."
+msgstr "Выберите хотя бы одну линию для упрощения."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88
@@ -12914,12 +13049,7 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] ""
-"Выделение содержит {0}  линию. способом. Вы уверены, что хотите упростить её?"
-msgstr[1] ""
-"Выделение содержит {0} линий. способом. Вы уверены, что хотите упростить их "
-"все?"
-msgstr[2] ""
-"Выделение содержит {0} линий. способом. Вы уверены, что хотите упростить их "
-"все?"
+msgstr[0] "Выделена {0} линия. Вы уверены, что хотите упростить её?"
+msgstr[1] "Выделено {0} линии. Вы уверены, что хотите упростить их все?"
+msgstr[2] "Выделено {0} линий. Вы уверены, что хотите упростить их все?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
@@ -12938,10 +13068,10 @@
 msgstr "Проверка не выявила ошибок"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Сетка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12970,9 +13100,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr "Показать информационный уровень при загрузке."
+msgstr "Показать информационный уровень при загрузке на сервер."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr "Показать информационное тесты в окне проверки загрузки"
+msgstr "Показать информационное тесты в окнах проверки загрузки на сервер"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
@@ -12982,5 +13112,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On upload"
-msgstr "При загрузке"
+msgstr "При загрузке на сервер"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
@@ -13023,16 +13153,34 @@
 msgstr "другое при проверке"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Проверка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Произвести проверку данных"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
-msgstr "Данные содержат ошибки. Всё равно продолжить?"
+msgstr "Данные содержат ошибки. Всё равно загрузить на сервер?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -13098,65 +13246,70 @@
 msgstr "Заменить \"{0}\" на \"{1}\" для"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Береговые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Этот тест проверяет павильность береговых линий."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Неупорядоченная береговая линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Пересекающиеся линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
 "the same layer, but are not connected by a node."
 msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+"Этот тест проверяет, соединены ли в точке пересечения две дороги "
+"(автомобильные, железные, водные) или два здания если они расположены в "
+"одном и том же слое."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+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:84
+msgstr "Этот тест проверяет, чтобы не было наложенных точек."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+msgstr "Точки в одной и той же позиции"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
 msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+"Этот тест проверяет - есть ли линии с одними и теми же тегами и одинаковыми "
+"координатами точек."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Удалить дубликаты линий"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13166,57 +13319,55 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
 msgid "Checks for ways with identical consecutive nodes."
-msgstr "Ищет линии с различными точками, имеющими одинаковые координаты"
+msgstr "Проверяет линии на наличие одинаковой последовательности точек"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
-msgstr "Дублирующиеся узлы на линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+msgstr "Дублирующиеся точки на линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Точки с одинаковыми названиями"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 "Этот тест ищет точки с одинаковыми названиями (возможно, это дубликаты)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Совпадающие линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
 "than one way."
-msgstr ""
-"Этот тест проверяет, чтобы участок, соединяющий две точки, использовался "
-"только одной линией."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+msgstr "Этот тест проверяет, чтобы две точки соединялись только одной линией."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Накладывающиеся области"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Перекрытие магистралей (местами)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Перекрытие железнодорожных путей (местами)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Перекрытие линий (местами)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Перекрытие магистралей"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Перекрытие железнодорожных путей"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Перекрытие линий"
@@ -13230,12 +13381,12 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr "Этот тест ищет линии, содержащие одну точку несколько раз."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+msgstr "Этот тест ищет линии, содержащие одну точку более одного раза."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Похожие названия линий"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -13243,24 +13394,24 @@
 "Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Проверка параметров:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Этот плагин проверяет на наличие ошибок в названиях ключей и их значений."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Неправильно просталенныех тегов линиий - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ошибка проверки правописания строки: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13271,7 +13422,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Неправильная комбинация тегов/значений тегов"
@@ -13279,80 +13430,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Проблемы отображения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправильный ключ {0}."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Пустые значения тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Неверный ключ свойств"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Неправильный пробел в названии ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "Значение начинается или заканчивается пробелом"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Значения содержат HTML разметку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключа ''{0}'' нет в настройках."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "Установки не содержат собственно ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Не содержит зарание устанвленного значения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Проверьте ключи свойств."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверьте, что ключ действителен проверен в отношении списка слов."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Использовать сложную проверку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверка собственных значений и использование сложных правил тегов."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Исходники TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13362,21 +13513,21 @@
 "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "Добавить в список новый источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Источники данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Проверьте правильно значений"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -13384,41 +13535,41 @@
 "установок проверки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Проверить для FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+msgstr "Ищет точки или линии с FIXME в свойствах какого-либо значения."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Проверить заметки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr "Проверить содержит ли нарисованная карта ошибки данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Использовать файл данных по умолчанию."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Используется файл данных установленный по умолчанию"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Использовать установленный по умолчанию файл проверки правописания"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
@@ -13426,70 +13577,70 @@
 "(рекомендуется)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Исправить параметры"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Не удалось найти тип элемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Не удалось найти  уровень предупреждения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Недопустимое выражение ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Недопустимое регулярное выражение ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Незамкнутые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Этот тест ищет разомкнутые линии, которые должны быть замкнутыми."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "естественного типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "землепользование типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "удобства типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "спорт типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "туризм типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "тип магазина: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "отдых типа {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13585,5 +13736,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13599,92 +13750,93 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "область"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Незамкнутая линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Несоединённые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Этот тест ищет линии, край которых расположен очень близко к другой линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
-msgstr "Последний узел линии рядом с существующим шоссе"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+msgstr "Последняя точка линии расположена около другой дороги"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
-msgstr "Последний узел линии рядом с другой линией"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+msgstr "Конец линии расположен около другой линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
-msgstr "Узел линии рядом с другой линией"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+msgstr "Точка линии расположена около другой линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
-msgstr "Конечный узел связной линии возле другой линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+msgstr "Конечная точка присоединённой линии расположена около другой линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
-msgstr "Непомеченные и не соединённые узлы"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+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 "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
-msgstr "Линии без тегов, пустые, из одной точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+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:90
+msgstr ""
+"Данный тест ищет линии без тегов, пустые, и линии, состоящие из одной точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Безымянные линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Перекрёсток без названия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Линии без тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Пустые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
-msgstr "Линии из одной точки"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+msgstr "Линии, состоящие из одной точки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Неверно упорядоченные линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Этот тест проверяет направление береговых линий."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "Неверное направление береговой линии: земля не слева"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "Неверное направление границы водоёма: земля не слева"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Неверное направление линии суши: земля не слева"
@@ -13726,5 +13878,5 @@
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
 msgid "Select a starting node on the end of a way"
-msgstr "Выделите начальный узел в конце пути"
+msgstr "Выделите начальную точку на конце линии"
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
@@ -13809,5 +13961,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
 msgid "Download Rectified Images From Various Services"
-msgstr "Загрузить привязанные изображения с различных сервисов"
+msgstr "Скачать исправленные изображения с различных служб"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
@@ -13919,5 +14071,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 msgid "(deactivated)"
-msgstr ""
+msgstr "(деактивировано)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
@@ -13946,5 +14098,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr ""
+msgstr "Ошибочная ссылка?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
@@ -13957,5 +14109,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Download visible tiles"
-msgstr "Скачать видимые квадраты"
+msgstr "Скачать видимые квадраты карты"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
@@ -14037,5 +14189,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr ""
+msgstr "Скопировать выделенное по умолчанию"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
@@ -14045,5 +14197,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
 msgid "Downloader:"
-msgstr "Загрузчик"
+msgstr "Средство скачивания:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
@@ -14103,8 +14255,15 @@
 #: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
-msgstr "Вы должны cделать изменения публичными, чтобы выгрузить новые данные"
+msgstr ""
+"Вы должны cделать изменения общедоступными, чтобы загрузить новые данные на "
+"сервер"
+
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
 
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14115,10 +14274,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "Особый обработчик на WMS-сервере французского земельного кадастра."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14135,17 +14294,17 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Создание сетки линий."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
-"Создание и управление адресованными узлами и зданиями в Чешской Республике"
+"Создание и управление адресованными точками и зданиями в Чешской Республике"
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -14153,19 +14312,19 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
 "openstreetmap.org."
 msgstr ""
-"Этот плагин непосредственно загрузит GPS трек из текущего активного слоя в "
+"Этот модуль загрузит GPS трек из текущего активного слоя непосредственно в "
 "JOSM на сайт openstreetmap.org."
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Дублирующиеся линии со смещением"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14176,22 +14335,22 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
-"Получить GPS точки со спутника GlobalSat dg100 Data Logger непосредственно в "
+"Принять GPS данные со спутника GlobalSat dg100 Data Logger непосредственно в "
 "JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Предоставлен фоновый слой который отображает сетку на карте"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14204,10 +14363,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Помогает векторизовать изображения WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14216,5 +14375,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14227,10 +14386,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14243,15 +14402,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Отобразить фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14261,5 +14420,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14267,5 +14426,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14276,15 +14435,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14295,10 +14454,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14309,15 +14468,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr "Разрешить добавить теги/узлы на текущей GPS позиции."
+msgstr "Разрешить добавить метки/точки в текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14331,17 +14490,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Инструменты для работы с авторами / пользователями. Выбирайте данные на "
-"карте, которые принадлежат отдельным пользователем, откроется браузер со "
-"страницей профиля выбранного автора."
 
 #. Plugin utilsplugin
@@ -14370,9 +14519,11 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Поддерживает скачивание сканированных карт по квадратам, из walking-papers."
+"org. Этот модуль пока еще совершенствуется и может плохо работать."
 
 #. Plugin waydownloader
 #: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr "Быстрая загрузка вдоль большого набор пересекающихся линий"
+msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin wmsplugin
@@ -15022,5 +15173,5 @@
 #: build/trans_presets.java:1309
 msgid "asphalt"
-msgstr ""
+msgstr "асфальт"
 
 #: build/trans_presets.java:243 build/trans_presets.java:261
@@ -15043,5 +15194,5 @@
 #: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
-msgstr ""
+msgstr "металл"
 
 #. color heath
@@ -15072,5 +15223,5 @@
 #: build/trans_presets.java:1309
 msgid "paving_stones"
-msgstr ""
+msgstr "дорожные_камни"
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -15913,5 +16064,5 @@
 #: build/trans_presets.java:450
 msgid "Pedestrians"
-msgstr ""
+msgstr "Пешеходы"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -15931,5 +16082,5 @@
 #: build/trans_presets.java:470
 msgid "Bikes"
-msgstr ""
+msgstr "Велосипеды"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -16683,10 +16834,10 @@
 #: build/trans_presets.java:1023
 msgid "Turnstile"
-msgstr ""
+msgstr "Турникет"
 
 #. item
 #: build/trans_presets.java:1024
 msgid "Edit Turnstile"
-msgstr ""
+msgstr "Редактировать турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
@@ -17068,5 +17219,5 @@
 #: build/trans_presets.java:1250
 msgid "Transport"
-msgstr ""
+msgstr "Транспорт"
 
 #. group "Transport"
@@ -17498,5 +17649,5 @@
 #: build/trans_presets.java:2754
 msgid "24/7"
-msgstr ""
+msgstr "24/7"
 
 #: build/trans_presets.java:1386 build/trans_presets.java:1625
@@ -17528,5 +17679,5 @@
 #: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Пн-Пт 08:30-20:00"
 
 #: build/trans_presets.java:1386 build/trans_presets.java:1625
@@ -17558,5 +17709,5 @@
 #: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Вт-Вс 08:00-15:00; Sa 08:00-12:00"
 
 #. group "Bicycle"
@@ -17629,9 +17780,9 @@
 #: build/trans_presets.java:1401
 msgid "Spaces for Women"
-msgstr ""
+msgstr "Места для женщин"
 
 #: build/trans_presets.java:1402
 msgid "Spaces for Parents"
-msgstr ""
+msgstr "Места для родителей"
 
 #: build/trans_presets.java:1403
@@ -17886,5 +18037,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Путешествие"
 
 #. group "Travel"
@@ -18216,10 +18367,10 @@
 #: build/trans_presets.java:1724
 msgid "Detail Grade"
-msgstr ""
+msgstr "Уровень детализации"
 
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1724
 msgid "topo"
-msgstr ""
+msgstr "топографический"
 
 #. color tertiary
@@ -18263,22 +18414,22 @@
 #: build/trans_presets.java:1724
 msgid "scheme"
-msgstr ""
+msgstr "схема"
 
 #: build/trans_presets.java:1725
 msgid "Shown Area"
-msgstr ""
+msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
+msgstr "место"
 
 #: build/trans_presets.java:1725
 msgid "city"
-msgstr ""
+msgstr "город"
 
 #: build/trans_presets.java:1725
 msgid "region"
-msgstr ""
+msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -18294,5 +18445,5 @@
 #: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Маршруты показаны для:"
 
 #. item "Tourism/Map" check "Hiking"
@@ -18307,5 +18458,5 @@
 #: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Езда на горных велосипедах"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -18320,5 +18471,5 @@
 #: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Катание"
 
 #. item "Tourism/Map" check "Riding"
@@ -18326,5 +18477,5 @@
 #: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "... другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
@@ -18336,10 +18487,10 @@
 #: build/trans_presets.java:1741
 msgid "Board Content"
-msgstr ""
+msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1741
 msgid "notice"
-msgstr ""
+msgstr "указатель"
 
 #: build/trans_presets.java:1741
@@ -18362,5 +18513,5 @@
 #: build/trans_presets.java:1744
 msgid "Guidepost"
-msgstr ""
+msgstr "Пост проводника"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
@@ -18373,14 +18524,14 @@
 #: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
-msgstr ""
+msgstr "Примерное описание"
 
 #: build/trans_presets.java:1769
 msgid "Audioguide"
-msgstr ""
+msgstr "Аудиогид"
 
 #. <space />
 #: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
@@ -18508,10 +18659,10 @@
 #: build/trans_presets.java:1852
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Пограничный камень"
 
 #. item
 #: build/trans_presets.java:1853
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Редактировать Пограничный камень"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -19320,4 +19471,24 @@
 msgstr "стадион"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr "трек"
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19670,5 +19841,5 @@
 #: build/trans_presets.java:2141
 msgid "Man-Made"
-msgstr ""
+msgstr "Рукотворное"
 
 #. group "Man-Made"
@@ -20073,10 +20244,4 @@
 msgstr "Код страны"
 
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Интерполяция адресов"
-
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
@@ -20469,31 +20634,31 @@
 #: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr ""
+msgstr "Кресло"
 
 #: build/trans_presets.java:2445
 msgid "Material"
-msgstr ""
+msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
 #: build/trans_presets.java:2445
 msgid "stone"
-msgstr ""
+msgstr "камень"
 
 #: build/trans_presets.java:2445
 msgid "plastic"
-msgstr ""
+msgstr "пластик"
 
 #: build/trans_presets.java:2446
 msgid "Colour"
-msgstr ""
+msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
 #: build/trans_presets.java:2446
 msgid "black"
-msgstr ""
+msgstr "чёрный"
 
 #: build/trans_presets.java:2446
 msgid "brown"
-msgstr ""
+msgstr "коричневый"
 
 #. color historic
@@ -20572,17 +20737,17 @@
 #: build/trans_presets.java:2446
 msgid "red"
-msgstr ""
+msgstr "красный"
 
 #: build/trans_presets.java:2446
 msgid "blue"
-msgstr ""
+msgstr "синий"
 
 #: build/trans_presets.java:2446
 msgid "white"
-msgstr ""
+msgstr "белый"
 
 #: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Крепление сидений"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
@@ -20718,5 +20883,5 @@
 #: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
-msgstr ""
+msgstr "Редактировать Турбюро"
 
 #: build/trans_presets.java:2518
@@ -21164,5 +21329,5 @@
 #: build/trans_presets.java:2758
 msgid "Geography"
-msgstr ""
+msgstr "География"
 
 #. group "Places"
@@ -21295,5 +21460,5 @@
 #: build/trans_presets.java:2838
 msgid "Islet"
-msgstr ""
+msgstr "Островок"
 
 #. item
@@ -21301,5 +21466,5 @@
 #: build/trans_presets.java:2840
 msgid "Edit Islet"
-msgstr ""
+msgstr "Редактировать островок"
 
 #. item "Places/Islet" text "Name"
@@ -22054,5 +22219,5 @@
 #: build/trans_presets.java:3164
 msgid "Route state"
-msgstr ""
+msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
@@ -26062,10 +26227,10 @@
 #: build/trans_validator.java:40
 msgid "oneway tag on a node"
-msgstr "тэг \"одностороннее движение\" в точке"
+msgstr "тег oneway в точке"
 
 #. node : W : oneway == *
 #: build/trans_validator.java:41
 msgid "bridge tag on a node"
-msgstr "тэг \"мост\" в точке"
+msgstr "тег bridge в точке"
 
 #. node : W : bridge == BOOLEAN_TRUE
@@ -26078,5 +26243,5 @@
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
-msgstr "неверный тэг \"дорога\" в точке"
+msgstr "неверный тэг highway в точке"
 
 #. node : W : highway == track
@@ -26234,13 +26399,13 @@
 #: 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 "parameter '{0}' must not be null"
-#~ msgstr "параметр '{0}' не должен быть null"
+msgstr "Czech UHUL:ORTOFOTO"
+
+#~ msgid "No data imported."
+#~ msgstr "Данные не импортированы"
 
 #~ msgid "Unknown file extension."
@@ -26249,4 +26414,7 @@
 #~ msgid "Email"
 #~ msgstr "Электронная почта"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Несохранённые изменения"
 
 #~ msgid "Contacting the OSM server..."
@@ -26536,4 +26704,13 @@
 #~ msgstr "Не удается прочитать каталог с настройками: {0}"
 
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Пожалуйста, выберите пользователя в панели авторов"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Извините, для анонимных пользователей это недоступно"
+
+#~ msgid "Please select some data"
+#~ msgstr "Пожалуйста, выберите данные"
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
@@ -26569,7 +26746,16 @@
 #~ msgstr "Публичный"
 
+#~ msgid "User"
+#~ msgstr "Пользователь"
+
 #~ msgid ""
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
 #~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Открыть страницу пользователя в браузере"
+
+#~ msgid "Open User Page"
+#~ msgstr "Открыть страницу пользователя"
 
 #~ msgid "YAHOO (WebKit GTK)"
@@ -26635,15 +26821,4 @@
 #~ "загруженных элементов есть история."
 
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в<A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">English</A> "
-#~ "или <A HREF=\"{1}\">вашем языке</A>."
-
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org"
@@ -26678,4 +26853,13 @@
 #~ msgid "Continue anyway"
 #~ msgstr "Продолжить в любом случае"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Заменить выбранное данными пользователя"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Выбрать данные пользователя"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Показать панель автора"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -26754,4 +26938,12 @@
 #~ "загрузки на OSM. Например, удалить неинтересные части трека."
 
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "Инструменты для работы с авторами / пользователями. Выбирайте данные на "
+#~ "карте, которые принадлежат отдельным пользователем, откроется браузер со "
+#~ "страницей профиля выбранного автора."
+
 #~ msgid "Directly load TCX files from JOSM."
 #~ msgstr "Прямо загрузить TCX файлы из JOSM."
@@ -26771,7 +26963,4 @@
 #~ msgid "viaduct"
 #~ msgstr "виадук"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- сейчас запущена версия {0}"
 
 #~ msgid "Image with path {0} does not exist or is not readable."
@@ -26882,4 +27071,7 @@
 #~ "html>"
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "параметр '{0}' не должен быть null"
+
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Подогнать позицию WMS слоя (только растровые изображения)"
@@ -26918,4 +27110,18 @@
 #~ "Исключение в: {0}"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Присутствуют не сохранённые изменения на {0} слое. Отменить изменения и "
+#~ "продолжить?"
+#~ msgstr[1] ""
+#~ "Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
+#~ "продолжить?"
+#~ msgstr[2] ""
+#~ "Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
+#~ "продолжить?"
+
 #~ msgid "There is currently no changeset open."
 #~ msgstr "В данный момент нет открытого пакета изменений"
@@ -26963,2 +27169,13 @@
 #~ msgid "paramete''{0}'' must not be null"
 #~ msgstr "параметр ''{0}'' не может быть нулём"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её в<A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">English</A> "
+#~ "или <A HREF=\"{1}\">вашем языке</A>."
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-20 06:46+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:21+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,8 +16,8 @@
 "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-09-20 08:24+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Pomocník"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projekcia {0} nemohla byť aktivovaná. Používam Mercator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,86 +115,11 @@
 msgstr "Chyba"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Vo vrstve sa nachádzajú neuložené {0} zmeny. Nepoužiť zmeny a pokračovať?"
-msgstr[1] ""
-"Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?"
-msgstr[2] ""
-"Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a pokračovať?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Neuložené zmeny"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Uložiť a Ukončiť"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Zrušiť a Ukončiť"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem skomolenú URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -211,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -225,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -250,13 +180,13 @@
 msgstr "Varovanie"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -404,4 +334,52 @@
 msgid "Merge"
 msgstr "Zlúčiť"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Zrušiť"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -497,4 +475,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -509,5 +488,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -544,6 +523,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -565,45 +544,4 @@
 msgid "Please select at least three nodes."
 msgstr "Vyberte prosím aspoň 3 body."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
-"{0}, maximálne je {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "API Capabilities Violation"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní "
-"pôvodných {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. povolenú "
-"dĺžku {2}. Dĺžka hodnôt je {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "Predpoklad Porušenia"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -672,5 +610,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -785,5 +723,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -799,5 +737,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -847,8 +785,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1019,5 +959,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameter ''{0}'' nesmie byť nulový"
 
@@ -1025,5 +965,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
 
@@ -1055,5 +995,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Upraviť"
@@ -1766,14 +1706,14 @@
 msgstr "Výber je prázdny"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Uložiť do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Uložiť všetky zmeny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1784,23 +1724,23 @@
 "vyriešte.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovať {0} {1} iba"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovať celú dátovú sadu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1821,17 +1761,17 @@
 "zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Zistený konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "neočakávaná hodnota. Dostal {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1846,19 +1786,20 @@
 "<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-"<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>súbor "
-"zmien {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, alebo "
-"existujúcimi súbormi zmien."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>zmenový "
+"súbor {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, alebo "
+"existujúcim zmenovým súborom.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr "Zmenový súbor zavretý"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1866,23 +1807,23 @@
 "Varovanie: chybné záhlavie \"{0}\" nie je zhoda  s očakávanou schémou \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Nahrávanie na OSM API neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Aktualizácia pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1994,8 +1935,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Neboli importované žiadne dáta."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2546,4 +2483,72 @@
 msgid "Error while communicating with server."
 msgstr "Chyba počas komunikácie so serverom"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
+"{0}, maximálne je {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "API Capabilities Violation"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní "
+"pôvodných {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. povolenú "
+"dĺžku {2}. Dĺžka hodnôt je {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "Predpoklad Porušenia"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Cyklická závislosť medzi reláciami:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké iné."
+"<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
+"závislosti.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Relácia ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... odkazy na relácie"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Cyklické závislosti"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2649,9 +2654,9 @@
 #, fuzzy, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
-msgstr ""
-"Varovanie:vrstva ''{0}'' neexistuje. Nemôžem odstrániť konflikt pre pôvodné "
-"''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+"VAROVANIE:vrstva ''{0}'' už viac neexistuje. Nemôžete vyriešiť konflikty pre "
+"pôvodné ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2675,5 +2680,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
 
@@ -2736,5 +2741,5 @@
 "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Rozdeliť segment cesty"
@@ -2742,6 +2747,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2753,5 +2758,5 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr "Odstrániť potvrdenie"
@@ -2861,7 +2866,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
+msgstr "Vyriešte konflikty v zozname bodov cesty {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -3051,5 +3056,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
 
@@ -3068,18 +3073,21 @@
 msgstr "Stupne minúty sekundy"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "V"
@@ -3093,41 +3101,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr "E"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr "H"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr "Text"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr "C"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr "M"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr "R"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr "D"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr "F"
@@ -3145,29 +3175,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr "očekávané id >= 0. Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+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:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
-msgstr "id > 0 očakávané. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, 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:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr "verzia > 0 očakávaná. Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
 
@@ -3177,6 +3208,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 "kolekcia značiek nemôže byť použitápre pôvodné pretože sú tam kľúče s  "
@@ -3185,27 +3216,28 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, 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:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+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:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "nenájdená staršia verzia. História je prázdna."
 
@@ -3218,12 +3250,6 @@
 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/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "parameter ''{0}'' > 0 očakávaný, dostáva ''{1}''"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
 
@@ -3231,5 +3257,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
@@ -3382,5 +3408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3392,5 +3418,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3402,5 +3428,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3898,5 +3924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "vrstva nie je v zozname"
 
@@ -3959,5 +3985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}"
 
@@ -4061,5 +4087,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "aktuálny parameter je mimo rozsahu: got {0}"
 
@@ -4067,15 +4093,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "položka {0} sa v zozname nenachádza"
 
@@ -4133,5 +4159,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy"
@@ -4140,5 +4166,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopírovať moje vybrané elementy pred prvý vybraný element v zozname pre "
@@ -4148,5 +4174,5 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 "Kopírovať moje vybrané elementy za prvý vybraný element v zozname pre "
@@ -4154,10 +4180,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
 msgstr ""
 "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy"
 
 #: ../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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
@@ -4166,5 +4193,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 "Kopírovať ich vybrané elementy pred prvý vybraný element v zozname pre "
@@ -4185,5 +4212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou"
 
@@ -4194,5 +4221,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou"
 
@@ -4207,5 +4234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
 
@@ -4217,5 +4244,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "Blokovať aktuálny zoznam spojovaných elementov"
 
@@ -4225,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie"
 
@@ -4231,5 +4258,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 "<html>Klik <strong>{0}</strong>pre začiatok spojovania mojich a ich "
@@ -4239,5 +4267,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4273,15 +4301,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr ""
-"nastaviteľný {0} ešte neregistrovaný. Nie je možné nastaviť spoluúčasť v "
-"nastavení synchronizácii"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "nastaviteľný {0} ešte neregistrovaný"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4290,5 +4316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
 
@@ -4296,5 +4322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "neočakávaný index stĺpca. Got {0}"
 
@@ -4501,5 +4527,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz"
@@ -4561,5 +4587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "nie je možné použiť neistú značku pri spojovaní prvkov"
 
@@ -4567,5 +4593,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
 
@@ -4675,15 +4701,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr "parameter ''{0}'' nemôže byť prázdny"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr "zbierka značiek neobsahuje vybrané hodnoty ''{0}''"
 
@@ -4692,7 +4718,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr "Ešte nerozhodnuté"
 
@@ -4760,5 +4784,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z  členov: {1}"
 
@@ -4782,4 +4806,9 @@
 msgid "Undecided"
 msgstr "Nerozhodnutý"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
+msgstr "Ešte nerozhodnuté"
 
 #. --- role editing
@@ -4943,5 +4972,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4999,5 +5028,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr "index je mimo hranice Dostať {0}"
 
@@ -5035,5 +5064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr "Zobraziť priebeh z vybraných pôvodných"
 
@@ -5104,5 +5133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<rôzne>"
@@ -5336,6 +5365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
 
@@ -5388,5 +5416,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5635,4 +5662,8 @@
 msgstr "Potvrdiť prázdnu funkciu"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+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
 msgid "Zoom to"
@@ -5666,6 +5697,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "child.getId() >0 očakávaný. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5938,5 +5974,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
@@ -5945,19 +5981,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+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:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
 
@@ -5965,9 +6005,4 @@
 msgid "Load history"
 msgstr "Nahrať priebeh"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr "id > 0 očakávaný, got {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -7110,4 +7145,8 @@
 msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Zrušiť a Ukončiť"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -7121,4 +7160,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "Vymazať vrstvy bez uloženia. Neuložený zmeny budú staratené."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Uložiť a Ukončiť"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7346,7 +7389,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
-msgstr "zmenový súbor id > 0 očekávaný. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
+msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7462,36 +7508,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps poloha bodu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7499,5 +7545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7506,5 +7552,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7539,4 +7585,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7598,5 +7645,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
@@ -7611,5 +7658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7617,5 +7664,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7723,5 +7770,5 @@
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7731,22 +7778,6 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
@@ -7755,5 +7786,5 @@
 msgstr[2] "stopy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7762,5 +7793,5 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7770,5 +7801,5 @@
 msgstr[2] "stopy s {0} bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7778,5 +7809,5 @@
 msgstr[2] "{0} skladá sa z {1} stôp"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7916,5 +7947,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Prosím vyberte riadok na úpravu."
@@ -7930,5 +7961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -8109,4 +8140,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8663,5 +8695,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Zmazať vybratý zdroj zo zoznamu."
@@ -8871,33 +8903,34 @@
 msgstr "Zmazať výber v tabuľke značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Viac informácii o tejto vlastnosti"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Použiť prednastavenie \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "uzavratá cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8908,15 +8941,15 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu(druhu) {0} sú podporované."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8927,18 +8960,18 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Zmeniť vlastnosti"
@@ -8968,10 +9001,4 @@
 msgstr "Sťahujem body {0} až {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr "parameter ''{0}'' > 0 očakávaný. Got {1}"
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8985,11 +9012,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr "Nemôžem exportovať \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Nemôžem čítať \"{0}\""
 
@@ -9008,5 +9034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "popis gps trasy"
 
@@ -9070,5 +9096,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -9081,5 +9106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
 
@@ -9091,5 +9116,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 "žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
@@ -9144,5 +9169,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 "Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou "
@@ -9184,5 +9209,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi"
 
@@ -9204,5 +9229,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}"
 
@@ -9210,5 +9235,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
 
@@ -9216,5 +9241,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 "neočakávaný formát novej verzie zo zmenených pôvodných ''{0}'', dostáva "
@@ -9230,10 +9255,4 @@
 msgstr "ˇUspešne otvorený súbor zmien {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr "id zo zmenového súboru > 0 požadovaný. Got {0}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -9250,5 +9269,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "Nenachádza sa tu súbor zmien pre diff nahratie"
 
@@ -9280,20 +9299,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
-msgstr "aktuálny zmenový súbor je prázdny. Nemôžem nahrať dáta."
+msgid "Current changeset is null. Can't upload data."
+msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr "id z aktuálneho zmenového súboru > požadovaný. Aktuálne id je {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
-msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}"
 
@@ -9306,5 +9320,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr "Server odpovedal chybou s kódom {0}"
 
@@ -9321,7 +9335,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr "chýbajúce povinné vlastnosti ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Chýbajúce povinné vlastnosti ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -9331,15 +9351,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr "chybné číselné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr "chybné booleovské hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
 
@@ -9347,12 +9367,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "Chýba povinná vlastnosť ''{0}'' z XML elementu {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Chýba povinný atribút ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
@@ -9370,5 +9384,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
 
@@ -9450,5 +9464,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 "<html>Nejaká chyba nastala počas ukladania.<br>Chyba je: <br>{0}</html>"
@@ -9457,5 +9471,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9473,15 +9487,8 @@
 msgstr "OSM Serverové Súbory gzip zbalené"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "povinný atribút ''{0}'' vynechaný"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}'' typu long , dostáva ''{1}''"
@@ -9490,5 +9497,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}'' typu long (>=0), dostáva "
@@ -9497,5 +9505,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
@@ -9504,5 +9512,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
@@ -9512,5 +9520,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}'' typu boolean, dostáva ''{1}''"
@@ -9519,6 +9527,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 "nedovolená hodnota pre povinný atribút ''{0}'' typu OsmPrimitiveType, "
@@ -9533,15 +9541,18 @@
 msgstr "Chyba v priebehu parsovania"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Súbor \"{0}\" neexistuje"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
-msgstr ""
-"Chýbajú povinné atribúty v elementoch ''hranice''. Got mindĺžka=''{0}'',"
-"minšírka=''{1}00,maxdĺžka=''{3}'',maxšírka=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+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>"
@@ -9549,14 +9560,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+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:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+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:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+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>"
@@ -9564,5 +9575,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
 
@@ -9575,5 +9586,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
 
@@ -9595,5 +9606,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
@@ -9602,44 +9613,27 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 "Neplatná hodnota pre vlastnosť ''verzia'' na OSM pôvodné s id {0}. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-"VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
-"API verzia je ''0.6''. Got {1}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-"VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
-"API verzia je ''0.5''. Got {1}"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-"VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API "
-"verziu je ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
+msgstr ""
 
 #. should not happen. API version has been checked before
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+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:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
 
@@ -9651,5 +9645,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
 
@@ -9657,21 +9651,18 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
-msgstr ""
-"cesta s externým id ''{0}'' obsahuje chýbajúci bod s externým id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
-msgstr ""
-"Označená cesta {0} s {1} bodov neúplných pretože aspoň jeden bod je "
-"vynechaný v nahratých dátach a je preto nekompletná tiež"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
 
@@ -9680,8 +9671,6 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
-msgstr ""
-"Relácia s externým id ''{0}'' odkazuje na chýbajúce pôvodné s externým id "
-"''{1}''"
+"id ''{1}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
@@ -9699,11 +9688,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr "parameter ''{0}'' > 0 požadovaný. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -9735,5 +9719,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
 
@@ -9748,5 +9732,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "Neúspešné nadviazanie spojenia do API {0}"
 
@@ -9757,5 +9741,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k "
@@ -9763,5 +9747,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr "XML značka(tag) <user> chýba"
 
@@ -9771,5 +9755,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Chýbajúca vlastnosť ''{0}'' na XML značke(tag) ''{1}''"
 
@@ -9779,5 +9763,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 "Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
@@ -9821,5 +9805,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -10254,5 +10238,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10330,5 +10314,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10339,5 +10323,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10348,5 +10332,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10357,5 +10341,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10366,5 +10350,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10512,4 +10496,134 @@
 msgstr "Nahrať Stopy (Traces) na openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolácia adries"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+"Handy Address Interpolation Functions (Funkcia šikovného priraďovania adresy)"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr "Definovať vloženie(interpolation) adresy"
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Nepárny (odd)"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Vyrovnať (even)"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr "Abecedne"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr "Relácia: {0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr "Pridružiť s využitím ulice:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr "Číslovací systém:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr "Spustenie #:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr "Ukončenie #:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr "Pridružiť {0} dodatočné body s číslami domov"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr "Mesto:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr "Štát:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr "PSČ:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr "Krajina:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr "Voliteľné informácie:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr "Prosím zvoľte ulicu pre pridruženie s adresami vloženou cestou"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr "Prosím vyberte adresami  vloženú cestu pre túto ulicu"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr "Očakávané nepárne čísla pre adresy"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr "Očakávané párne čísla pre adresy"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr "Kód krajiny musí byť z 2 písmen"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr "Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr "Abecedné adresy musia končiť s písmenom"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr "Spúšťajúce písmeno adresy musí byť nižšie ako konečné písmeno adresy"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr "Prosím vložte platné číslo pre spustenie adresovania"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr "Prosím vložte platné číslo pre ukončenie adresovania"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr "Spúšťajúce adresné číslo musí byť nižšie ukončovacie adresné číslo"
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10628,4 +10742,9 @@
 msgid "Error while parsing {0}"
 msgstr "Chyba pri rozkladaní {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nemôžem čítať \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10925,13 +11044,13 @@
 msgstr "Vybrať z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10943,13 +11062,13 @@
 "Budete si želať obnoviť F11 pre grabovanie?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -11335,28 +11454,28 @@
 msgstr "Prázdna vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Nie je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Veľkosť rastra: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11367,9 +11486,9 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11378,5 +11497,5 @@
 "Lambertova zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "Cache chýb v Lambert Zóne"
@@ -12784,13 +12903,4 @@
 msgstr "Rad (Terrace)"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Vyrovnať (even)"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Nepárny (odd)"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12814,41 +12924,4 @@
 msgid "Optional"
 msgstr "Voliteľné"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Užívateľ"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Zobraziť panel autorov(spracovateľov)"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Otvoriť stránku uživateľa"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Otvoriť stránku uživateľa v prehliadači"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Vybrať dáta uživateľa"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Vymeniť výber s dátami užívateľa"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Prosím vyberte nejaké dáta"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Prosím vyberte si užívateľa pre používanie author panel"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Prepáčte, nefunguje s anonymnými uživateľmi."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -13026,10 +13099,10 @@
 msgstr "Žiadne chyby na overenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Mriežka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -13113,12 +13186,30 @@
 msgstr "ostatné overovania"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr "Priebežný test {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Kontrola"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Vykonať overovanie dát"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr "Overovanie"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr "Pokus {0}/{1}: Spustenie {2}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr "Nahrávam ignorujúc chyby ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13188,21 +13279,21 @@
 msgstr "Zameňte \"{0}\" za \"{1}\" pre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Línia pobrežia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnosť línií pobrežia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Neusporiadané pobrežie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Krížiace sa cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -13212,35 +13303,35 @@
 "križujú v rovnakej vrstve, ale nekrižujú sa v spoločnom bode."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr "Krížené budovy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Zkrížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicitné body"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Tento test zisťuje či nie je viac bodov na jednom mieste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Body s rovnakou pozíciou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Potvrdenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr "Zdvojené (duplikované) cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -13250,5 +13341,5 @@
 "rovnakými suradnicami bodov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr "Vymazať zdvojené (duplikované) cesty"
@@ -13266,10 +13357,10 @@
 msgstr "Duplicitné body v ceste"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Body s rovnakými názvami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -13277,9 +13368,9 @@
 "duplicity)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Prekrývajúce sa cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -13289,29 +13380,29 @@
 "cestou."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Prekrývajúce sa plochy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Prekrývajúce sa komunikácie (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Prekrývajúce sa železnice (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Prekrývajúce sa cesty (s plochou)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Prekrývajúce sa komunikácie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Prekrývajúce sa železnice"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Prekrývajúce sa cesty"
@@ -13327,33 +13418,33 @@
 msgstr "Tento test kontroluje cesty, či neobsahujú niektorý bod viac ako raz."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Cesty s podobnými menami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Tento plugin kontroluje chyby kľúčov a ich hodnôt."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Neplatný tagchecker line - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Neplatný spellcheck line: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13364,7 +13455,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinácia klúča/hodnoty"
@@ -13372,81 +13463,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problém s vykresľováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klúč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Klúče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Neplatné vlastnosti kľúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Kľúč ''{0}'' nie je predvolený."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 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:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je predvolená."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "Predvoľba neobsahuje vlastnost hodnoty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Kontrola vlastností kľúčov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Kontroluje platnosť vlastností kľúčov proti zoznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Použíť komplexnú kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Kontroluje platnosť hodnôt a tagů(značiek) pomocou komplexných pravidel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "TagChecker source"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13457,91 +13548,91 @@
 "značiek."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Zdroje dát"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Kontrola vlastností hodnôt ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr "Kontroluje platnosť vlastností hodnôt proti prednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Kontrola pre FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Pohľad pre body, alebo cesty s FIXME v hodnotách vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Kontrola pre poznámky (notes)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Použite štandardný dátový súbor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Použite štandardný dátový súbor (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr "Použite východzie značky ignorovaného súboru."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr "Použite východzie značky ignorovaného súboru (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Použite štandardný spellcheck súbor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Použite štandardný spellcheck súbor (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Oprava vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Nemôžem nájsť typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Nemôžem nájsť úroveň varovania."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Neplatný regulárny výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Neuzavreté cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
@@ -13549,40 +13640,40 @@
 "uzavreté."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "prírodné (natural) {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "využitie oblasti (landuse) {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "zaujímavosti (amenity) {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "športové {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turistika {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "obchody (shop) {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "oddych (Leisure) {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13678,5 +13769,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13692,43 +13783,43 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "oblasť(plocha)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Neuzavretá cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Nepripojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 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:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový bod cesty je blízko inej cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Neotagované(neoznačené) a nespojené body."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13736,49 +13827,49 @@
 "cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Neotagované(neoznačené), prázdne a jednobodové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Tento test hledá neotagované(neoznačené), prázdne a jednobodové cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Nepomenované cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr "Nepomenované spojenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Neotagované(neoznačené) cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Prázdne cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Cesty s jediným bodom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Zle usporiadané cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 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:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Obrátená zem: zem nie je na ľavej strane"
@@ -14208,6 +14299,11 @@
 msgstr "Musíte urobiť vaše zmeny verejnými pre nahratie nových dát"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr "Skupinu common Address Interpolation uložiť v jedinom dialógu,"
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -14218,10 +14314,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "Špeciálny manipulant pre francúzsky WMS server pozemkového registra."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -14238,10 +14334,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "Vytvoriť cestnú sieť"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -14249,10 +14345,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Dovoliť import rôzdnych formátov súborov priamo do JOSMu."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -14263,10 +14359,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "Duplikovaná Cesta s vyrovnaním(offset)"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -14277,5 +14373,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -14283,15 +14379,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualizes routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14304,10 +14400,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "Pomoc pri vektorizácii WMS obrázkov."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -14317,5 +14413,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -14328,10 +14424,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest"
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -14344,15 +14440,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazenie OpenLayers obrázok pozadia"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importovať vydania z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14362,5 +14458,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14369,5 +14465,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14378,15 +14474,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "Nechať ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14397,10 +14493,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "Určiť trasové schopnosti"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14411,15 +14507,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Povoliť pridávani značiek/bodov na aktuálnu gps pozíciu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Určiť dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14432,17 +14528,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvárať radové domy mimo jednotlivých blokov."
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré patria "
-"vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou stránkou "
-"profilu autora."
 
 #. Plugin utilsplugin
@@ -19436,4 +19522,24 @@
 msgstr "štadión"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr "stopa"
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -20188,10 +20294,4 @@
 msgid "Country code"
 msgstr "Kód krajiny"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolácia adries"
 
 #. item
@@ -26358,7 +26458,4 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' nesmie byť nulový"
-
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -26391,6 +26488,12 @@
 #~ msgstr "nepomenované"
 
+#~ msgid "No data imported."
+#~ msgstr "Neboli importované žiadne dáta."
+
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neuložené zmeny"
 
 #~ msgid "Found <nd> element in non-way."
@@ -26526,4 +26629,25 @@
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Nájdený <member> element mimo relácie."
+
+#~ msgid "User"
+#~ msgstr "Užívateľ"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Prepáčte, nefunguje s anonymnými uživateľmi."
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Vymeniť výber s dátami užívateľa"
+
+#~ msgid "Please select some data"
+#~ msgstr "Prosím vyberte nejaké dáta"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Otvoriť stránku uživateľa v prehliadači"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Vybrať dáta uživateľa"
+
+#~ msgid "Open User Page"
+#~ msgstr "Otvoriť stránku uživateľa"
 
 #~ msgid "viaduct"
@@ -26618,4 +26742,7 @@
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Prosím vyberte si užívateľa pre používanie author panel"
 
 #~ msgid "Metacarta Map Rectifier image id"
@@ -26695,4 +26822,7 @@
 #~ msgstr "tabuľa"
 
+#~ msgid "Show Author Panel"
+#~ msgstr "Zobraziť panel autorov(spracovateľov)"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Autori(spracovatelia): {0}"
@@ -26817,17 +26947,11 @@
 #~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu."
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- teraz používaná verzia je {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
 #~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> "
-#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
+#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré "
+#~ "patria vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou "
+#~ "stránkou profilu autora."
 
 #~ msgid "Directly load TCX files from JOSM."
@@ -26951,4 +27075,7 @@
 #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got "
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parameter '{0}' nesmie byť nulový"
+
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
@@ -27151,4 +27278,16 @@
 #~ "limitu servera. Výnimka bola: {1}"
 
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Vo vrstve sa nachádzajú neuložené {0} zmeny. Nepoužiť zmeny a pokračovať?"
+#~ msgstr[1] ""
+#~ "Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?"
+#~ msgstr[2] ""
+#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a "
+#~ "pokračovať?"
+
 #~ msgid "There is currently no changeset open."
 #~ msgstr "Teraz tam nie je otvorený súbor zmien."
@@ -27221,2 +27360,30 @@
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''"
+
+#~ msgid "Missing mandatory attribute ''{0}''"
+#~ msgstr "Chýba povinný atribút ''{0}''"
+
+#~ msgid ""
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
+#~ "API version is ''0.5''. Got {1}"
+#~ msgstr ""
+#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
+#~ "API verziu je ''0.5''. Got {1}"
+
+#~ msgid ""
+#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
+#~ "API version is ''0.5''. Got {1}"
+#~ msgstr ""
+#~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
+#~ "API verzia je ''0.5''. Got {1}"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> "
+#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:17+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:06+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,8 +17,8 @@
 "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-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -26,5 +26,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -33,14 +33,14 @@
 msgstr "Pomoč"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -77,6 +77,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -91,4 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -104,6 +109,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -111,82 +116,11 @@
 msgstr "Napaka"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Neshranjene spremembe"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Shrani in končaj"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Zavrzi in končaj"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -208,7 +142,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -222,5 +156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -247,13 +181,13 @@
 msgstr "Pozor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Prekliči"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,39 +536,4 @@
 msgid "Please select at least three nodes."
 msgstr "Prosim, izberite vsaj 3 vozlišča."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -654,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -762,5 +710,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -776,5 +724,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -824,8 +772,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -996,5 +946,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parameter ''{0}'' ne sme biti ničen"
 
@@ -1002,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1032,5 +982,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Uredi"
@@ -1713,14 +1663,14 @@
 msgstr "Izbor je prazen"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Pošlji v OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Pošlji vse spremembe na strežnik OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1729,23 +1679,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1759,17 +1709,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1780,39 +1730,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1924,8 +1875,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Nič podatkov ni bilo uvoženih."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2445,4 +2392,63 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
 msgid "Error while communicating with server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
 msgstr ""
 
@@ -2548,6 +2554,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2572,5 +2578,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2626,5 +2632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr ""
@@ -2632,6 +2638,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2640,5 +2646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2912,5 +2918,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2929,18 +2935,21 @@
 msgstr "Stopinje Minute Sekunde"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "V"
@@ -2954,41 +2963,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3006,29 +3037,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3038,33 +3070,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3077,12 +3110,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3090,5 +3117,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3238,5 +3265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3249,5 +3276,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3260,5 +3287,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3739,5 +3766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "plasti ni na seznamu."
 
@@ -3800,5 +3827,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3898,5 +3925,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3904,15 +3931,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3968,5 +3995,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3974,5 +4001,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3980,13 +4007,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3994,5 +4022,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4009,5 +4037,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "Premakni izbrani element za eno mesto višje"
 
@@ -4018,5 +4046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "Premakni izbrani element za eno mesto nižje"
 
@@ -4031,5 +4059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4041,5 +4069,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4049,5 +4077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4055,5 +4083,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4061,5 +4090,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4090,6 +4119,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4097,5 +4126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4105,5 +4134,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4111,5 +4140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4304,5 +4333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4363,5 +4392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4369,5 +4398,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4477,14 +4506,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4493,7 +4522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4558,5 +4585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4579,4 +4606,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4732,5 +4764,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4788,5 +4820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4824,5 +4856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4894,5 +4926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<različno>"
@@ -5120,6 +5152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5171,5 +5202,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5395,4 +5425,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5426,5 +5460,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5693,5 +5732,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5699,28 +5738,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6833,4 +6871,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Zavrzi in končaj"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6844,4 +6886,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Shrani in končaj"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7062,6 +7108,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7179,36 +7228,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "točka GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7216,5 +7265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7223,5 +7272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7256,4 +7305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7312,5 +7362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
@@ -7323,5 +7373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7329,5 +7379,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7431,5 +7481,5 @@
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7437,30 +7487,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "sledi"
-msgstr[1] "sled"
-msgstr[2] "sledi"
-msgstr[3] "sledi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7470,5 +7502,5 @@
 msgstr[3] "točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7479,5 +7511,5 @@
 msgstr[3] "sled z {0} točkami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7486,5 +7518,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7614,5 +7646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Prosim izberite vrstico za urejanje."
@@ -7628,5 +7660,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7794,4 +7826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8335,5 +8368,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Izbriši izbrani vir iz seznama."
@@ -8520,33 +8553,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Uporabi prednastavitev ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8557,15 +8591,15 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8577,18 +8611,18 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -8618,10 +8652,4 @@
 msgstr "Sprejem točk od {0} do {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8635,11 +8663,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Ni bilo možno prebrati \"{0}\""
 
@@ -8658,5 +8685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "Opis GPS sledi"
 
@@ -8720,5 +8747,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8731,5 +8757,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
@@ -8741,5 +8767,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8791,5 +8817,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8829,5 +8855,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8845,5 +8871,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8851,5 +8877,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8857,5 +8883,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8869,10 +8895,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
@@ -8889,5 +8909,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8919,20 +8939,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8945,5 +8960,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8960,6 +8975,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8970,15 +8991,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8986,11 +9007,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9009,5 +9024,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9085,5 +9100,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9091,5 +9106,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9105,15 +9120,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9121,10 +9129,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9132,5 +9141,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9138,5 +9147,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9144,6 +9153,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9156,32 +9165,37 @@
 msgstr "Napaka med razčlenjevanjem."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9193,5 +9207,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9212,5 +9226,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "predmet z id=0 ni dovoljen"
 
@@ -9219,26 +9233,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9246,10 +9249,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9261,5 +9264,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9267,5 +9270,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9273,6 +9276,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9280,5 +9283,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9287,5 +9290,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9304,10 +9307,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9340,5 +9338,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9353,5 +9351,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9362,5 +9360,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Ni se bilo mogoče povezati s strežnikom OSM. Preverite vašo povezavo z "
@@ -9368,5 +9366,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9376,5 +9374,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9384,5 +9382,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9423,5 +9421,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9823,5 +9821,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9886,5 +9884,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9893,5 +9891,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9900,5 +9898,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9907,5 +9905,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9914,5 +9912,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10052,4 +10050,133 @@
 msgstr "Pošlji sledi na openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Interpolacija naslovov"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10164,4 +10291,9 @@
 msgid "Error while parsing {0}"
 msgstr "Napaka pri razčlenjevanju {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, 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
@@ -10444,13 +10576,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10459,13 +10591,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10818,28 +10950,28 @@
 msgstr "Prazna plast"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10848,14 +10980,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12228,13 +12360,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12259,41 +12382,4 @@
 msgstr ""
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
 msgid "Join overlapping Areas"
@@ -12463,10 +12549,10 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Mreža"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12544,12 +12630,30 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Preverjanje veljavnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Izvede preverbo veljavnosti podatkov"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12619,21 +12723,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12641,35 +12745,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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 "Podvojena vozlišča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12677,5 +12781,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12693,18 +12797,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12712,29 +12816,29 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Prekrivajoče površine"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Prekrivajoče poti"
@@ -12750,33 +12854,33 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Podobno imenovane poti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Preverjanje lastnosti:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12785,7 +12889,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -12793,80 +12897,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12874,130 +12978,130 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Viri podatkov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Preveri vrednosti lastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Uporabi privzeto datoteko."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "Uporabi privzeto datoteko (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Uporabi privzeto datoteko za črkovanje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Popravi lastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "vrsta turizma {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "vrsta prostega časa {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13093,5 +13197,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13107,91 +13211,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Neimenovane poti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr ""
@@ -13577,6 +13681,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13585,10 +13694,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13600,10 +13709,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13611,10 +13720,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13623,10 +13732,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13635,20 +13744,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13658,10 +13767,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13669,5 +13778,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13677,10 +13786,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13690,15 +13799,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13706,5 +13815,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13712,5 +13821,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13719,15 +13828,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13736,10 +13845,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13748,15 +13857,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13766,13 +13875,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18745,4 +18847,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19497,10 +19619,4 @@
 msgid "Country code"
 msgstr ""
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Interpolacija naslovov"
 
 #. item
@@ -25666,7 +25782,4 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' ne sme biti ničen"
-
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -25675,6 +25788,12 @@
 #~ 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:"
@@ -25809,4 +25928,7 @@
 #~ "geslu.</b></html>"
 
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
+
 #~ msgid "Tagging preset source"
 #~ msgstr "Vir prednastavljenih oznak"
@@ -25847,2 +25969,5 @@
 #~ msgid "relations"
 #~ msgstr "relacije"
+
+#~ 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 17763)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-15 02:22+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:22+0000\n"
 "Last-Translator: Mattias Dalkvist <dalkvist@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:24+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -25,5 +25,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -32,14 +32,14 @@
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -76,6 +76,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -90,4 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -103,6 +108,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -110,84 +115,11 @@
 msgstr "Fel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
-msgstr[1] ""
-"Det finns osparade ändringar i {0} lager. Förkasta ändringarna och fortsätt?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Osparade ändringar"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Spara och avsluta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Kassera och avsluta"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -209,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -223,5 +155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -248,13 +180,13 @@
 msgstr "Varning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -397,4 +329,52 @@
 msgid "Merge"
 msgstr "Sammanfoga"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Avbryt"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -490,4 +470,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -502,5 +483,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -537,6 +518,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -558,46 +539,4 @@
 msgid "Please select at least three nodes."
 msgstr "Välj åtminstone tre noder."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Antal ändringar överskrider det maximala antalet ändringar, antal ändringar "
-"är {0}, max är {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "Bryter mot API:ns möjligheter"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-"VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. "
-"tillåtna längden ({2}). Värdets längd är {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -666,5 +605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -781,5 +720,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -795,5 +734,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -843,8 +782,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1016,5 +957,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parametern ''{0}'' får inte vara null"
 
@@ -1022,5 +963,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
 
@@ -1052,5 +993,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Redigera"
@@ -1754,14 +1695,14 @@
 msgstr "Tom markering"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Skicka in till OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1770,23 +1711,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisera enbart {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "Synkronisera hela datasetet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1800,17 +1741,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "Konflikt upptäkt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "oförväntat returvärde. Erhöll {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1826,16 +1767,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1843,23 +1785,23 @@
 "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "Uppladningen till OSM API misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr "Uppdaterar primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1971,8 +1913,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "Ingen data importerad."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2517,4 +2455,70 @@
 msgstr "Fel under kommunikation med servern."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+"Antal ändringar överskrider det maximala antalet ändringar, antal ändringar "
+"är {0}, max är {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "Bryter mot API:ns möjligheter"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+"VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. "
+"tillåtna längden ({2}). Värdets längd är {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+"{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2616,6 +2620,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2642,5 +2646,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2696,5 +2700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Dela delsträcka"
@@ -2702,6 +2706,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2713,5 +2717,5 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2817,7 +2821,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Lös konflikter i nodlistan för väg {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2987,5 +2991,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -3004,18 +3008,21 @@
 msgstr "Grader Minuter Sekunder"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "N"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "Ö"
@@ -3029,41 +3036,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "parameter {0} > 0 krävs. Erhöll {1}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3081,29 +3110,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3113,33 +3143,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+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:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+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:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "ingen senaste version funnen. Historiken är tom."
 
@@ -3152,12 +3183,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
 
@@ -3165,5 +3190,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3313,5 +3338,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3322,5 +3347,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3331,5 +3356,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3817,5 +3842,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "lagret finns inte i listan."
 
@@ -3878,5 +3903,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3976,5 +4001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3982,15 +4007,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -4046,5 +4071,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4052,5 +4077,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -4058,13 +4083,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4072,5 +4098,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4087,5 +4113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4096,5 +4122,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4109,5 +4135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4119,5 +4145,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4127,5 +4153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4133,5 +4159,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4139,5 +4166,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4168,6 +4195,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4175,5 +4202,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4183,5 +4210,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4189,5 +4216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4384,5 +4411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4443,5 +4470,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4449,5 +4476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4557,14 +4584,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4573,7 +4600,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4638,5 +4663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4659,4 +4684,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4813,5 +4843,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4869,5 +4899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4905,5 +4935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4973,5 +5003,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<olika>"
@@ -5199,6 +5229,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5250,5 +5279,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5474,4 +5502,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5505,5 +5537,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5773,5 +5810,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5779,28 +5816,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6913,4 +6949,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Kassera och avsluta"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6924,4 +6964,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Spara och avsluta"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7142,6 +7186,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7257,36 +7304,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps-punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
 #: ../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 "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
 #: ../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 "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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7294,5 +7341,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7301,5 +7348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7334,4 +7381,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7390,5 +7438,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
@@ -7403,5 +7451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7409,5 +7457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7515,5 +7563,5 @@
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7521,28 +7569,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "spår"
-msgstr[1] "spår"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -7550,5 +7582,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7557,5 +7589,5 @@
 msgstr[1] "ett spår med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7564,5 +7596,5 @@
 msgstr[1] "{0} består av {1} spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7695,5 +7727,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Välj vilken rad du vill ändra."
@@ -7709,5 +7741,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7888,4 +7920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8442,5 +8475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Ta bort vald källa från listan."
@@ -8655,33 +8688,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Använd snabbval ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "slutenväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8692,15 +8726,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekt av typ {0} stöds."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8710,18 +8744,18 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Ändra egenskaper"
@@ -8751,10 +8785,4 @@
 msgstr "Hämtar punkter {0} till {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8768,11 +8796,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Kunde inte öppna \"{0}\""
 
@@ -8791,5 +8818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "beskrivning av gps-spår"
 
@@ -8853,5 +8880,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8864,5 +8890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
 
@@ -8874,5 +8900,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8924,5 +8950,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8962,5 +8988,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8978,5 +9004,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8984,5 +9010,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8990,5 +9016,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9000,10 +9026,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -9022,5 +9042,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -9052,20 +9072,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -9078,5 +9093,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -9093,6 +9108,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -9103,15 +9124,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9119,11 +9140,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9142,5 +9157,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9219,5 +9234,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9225,5 +9240,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9239,15 +9254,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9255,10 +9263,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9266,5 +9275,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9272,5 +9281,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9278,6 +9287,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9290,32 +9299,37 @@
 msgstr "Fel vid tolkning."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9327,5 +9341,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9346,5 +9360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Ogiltigt objekt med id=0"
 
@@ -9353,26 +9367,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9380,10 +9383,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9395,5 +9398,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9401,5 +9404,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9407,6 +9410,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9414,5 +9417,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9421,5 +9424,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9438,10 +9441,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9474,5 +9472,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9487,5 +9485,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9496,10 +9494,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9509,5 +9507,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9517,5 +9515,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9556,5 +9554,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9969,5 +9967,5 @@
 "är:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10041,5 +10039,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -10048,5 +10046,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10055,5 +10053,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -10062,5 +10060,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -10069,5 +10067,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10207,4 +10205,133 @@
 msgstr "Skickar in spår till openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Adressinterpolation"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "Udda"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "Jämna"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10323,4 +10450,9 @@
 msgid "Error while parsing {0}"
 msgstr "Fel vid tolkning {0}"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kunde inte öppna \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10615,13 +10747,13 @@
 msgstr "Välj en av..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10630,13 +10762,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10995,28 +11127,28 @@
 msgstr "Tomt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, 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:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "Är inte vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "Är vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -11027,14 +11159,14 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12435,13 +12567,4 @@
 msgstr "Husrad"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "Jämna"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "Udda"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12465,41 +12588,4 @@
 msgid "Optional"
 msgstr "Valfri"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Användare"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Visa upphovsmannafönstret"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Öppna användarsida"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Öppna användarens sida i en webbläsare"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Välj användardata"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Ersätter urvalet med användarens data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "Välj några data"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Välj en användare m h a upphovsmannafönstret"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Det fungerar tyvärr inte med anonyma användare"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12680,10 +12766,10 @@
 msgstr "Inga valideringsfel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Rutnät"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12765,12 +12851,30 @@
 msgstr "andra typer av validering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Validering"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Utför datavalidering"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12840,21 +12944,21 @@
 msgstr "Ersätt \"{0}\" med \"{1}\" för"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Kustlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Detta test kontrollerar om kustlinjerna är korrekta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Oordnad kustlinje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "Korsande sträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12862,36 +12966,36 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "Korsande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 ""
 "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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12899,5 +13003,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12915,18 +13019,18 @@
 msgstr "Dubbletter av noder på sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Noder med samma namn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Detta test hittar noder som har samma namn (de kan vara dubbletter)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Överlappande sträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12936,29 +13040,29 @@
 "sträcka."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Överlappande ytor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Överlappande vägar (med yta)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Överlappande järnvägar (med yta)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Överlappande sträckor (med yta)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Överlappande vägar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Överlappande järnvägar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Överlappande sträckor"
@@ -12976,10 +13080,10 @@
 "gång."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Sträckor med likartade namn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
@@ -12988,23 +13092,23 @@
 "felstavning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Egenskapskontrollerare:"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Ogiltig taggkontrollsrad - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Ogiltig rättstavningsrad: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -13015,7 +13119,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Ogiltig kombination av nyckel och värde"
@@ -13023,80 +13127,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Ritningsproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nyckeln ''{0}'' är ogiltig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Taggar med tomma värden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Ogiltig egenskapsnyckel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 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:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXME-taggar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Kontrollera egenskapsnycklar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 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:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Använd komplicerad egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Källa för TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -13107,132 +13211,132 @@
 "taggkontrollera datafiler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Datakällor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Kontrollera egenskapsvärden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Leta efter FIXME-taggar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Kontrollera om det finns ritningsanmärkningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Använd förvald datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Använd förvalda rättstavningsfil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Rätta till egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Kunde inte hitta elementtyp"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Kunde inte hitta varningsnivå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ogiltigt uttryck ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Ogiltigt reguljärt uttryck ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Ej slutna sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Detta kontrollerar om sträckor som bör bilda en cirkel är slutna"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "naturfenomen typ {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "markanvändningstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "inrättningstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "sporttyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turismtyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "affärstyp {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "fritidstyp  {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13328,5 +13432,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13342,18 +13446,18 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "yta (area)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Ej stängd sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Ej anslutna sträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13361,26 +13465,26 @@
 "annan sträcka."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 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:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Slutnod på sträcka nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Noder som saknar tagg och inte ingår i en sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
@@ -13388,9 +13492,9 @@
 "sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Otaggade, tomma eller ennodssträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
@@ -13398,29 +13502,29 @@
 "en enda nod."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "Sträckor utan namn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Sträckor utan tagg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Tomma sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Ennodssträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Oordnade sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr ""
@@ -13428,13 +13532,13 @@
 "land (land) och kustlinje (coastline)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Felriktat land: land inte på vänster sida"
@@ -13823,6 +13927,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13833,10 +13942,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13848,10 +13957,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13859,10 +13968,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13871,10 +13980,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13883,20 +13992,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13906,10 +14015,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13917,5 +14026,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13925,10 +14034,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13938,15 +14047,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13954,5 +14063,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13960,5 +14069,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13967,15 +14076,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13984,10 +14093,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13996,15 +14105,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14014,13 +14123,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18993,4 +19095,24 @@
 msgstr "stadion"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19745,10 +19867,4 @@
 msgid "Country code"
 msgstr "Landskod"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Adressinterpolation"
 
 #. item
@@ -25920,4 +26036,7 @@
 #~ msgstr "Email"
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Osparade ändringar"
+
 #~ msgid "Object"
 #~ msgstr "Objekt"
@@ -25995,4 +26114,7 @@
 #~ msgid "Data Layer"
 #~ msgstr "Datalager"
+
+#~ msgid "No data imported."
+#~ msgstr "Ingen data importerad."
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -26250,4 +26372,28 @@
 #~ msgstr "Kan inte öppna inställningsmappen: {0}"
 
+#~ msgid "User"
+#~ msgstr "Användare"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Välj en användare m h a upphovsmannafönstret"
+
+#~ msgid "Please select some data"
+#~ msgstr "Välj några data"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Öppna användarens sida i en webbläsare"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Visa upphovsmannafönstret"
+
+#~ msgid "Open User Page"
+#~ msgstr "Öppna användarsida"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Det fungerar tyvärr inte med anonyma användare"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Ersätter urvalet med användarens data"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Upphovsmän: {0}"
@@ -26258,4 +26404,7 @@
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Konflikter: {0}"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Välj användardata"
 
 #~ msgid "Click Reload to refresh list"
@@ -26364,7 +26513,4 @@
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Följande fel uppstod vid massnedladdning:"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- nuvarande version är {0}"
 
 #~ msgid ""
@@ -26387,14 +26533,4 @@
 #~ "inte använder en fransk WMS-server.\n"
 #~ "Skicka inte in några data efter du har fått detta meddelande."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
 
 #~ msgid "Undeleting Way..."
@@ -26466,2 +26602,23 @@
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Radera relationsmedlem {0} {1}"
+
+#~ msgid ""
+#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
+#~ msgid_plural ""
+#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
+#~ msgstr[0] ""
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
+#~ "fortsätt?"
+#~ msgstr[1] ""
+#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
+#~ "fortsätt?"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
+#~ "\"{1}\">ditt språk</A>."
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 17764)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:34+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:00+0000\n"
 "Last-Translator: katpatuka <email@katpatuka.org>\n"
 "Language-Team: Türkçe\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -27,5 +27,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -34,14 +34,14 @@
 msgstr "Yardım"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -78,6 +78,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -92,4 +92,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -105,6 +110,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -112,82 +117,11 @@
 msgstr "Hata"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "Kaydedilmemiş Değişiklikler"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "Kaydet ve Çık"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "Vazgeç ve Çık"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "İptal"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Yanlış linkler atlanıldı: URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -209,7 +143,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -223,5 +157,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -248,13 +182,13 @@
 msgstr "Uyarı"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "hatalı dosya atlandı URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -395,4 +329,52 @@
 msgid "Merge"
 msgstr "Birleştir"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "İptal"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -486,4 +468,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -498,5 +481,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -533,6 +516,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -554,39 +537,4 @@
 msgid "Please select at least three nodes."
 msgstr "En azından üç nokta seçmen lazım"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -655,5 +603,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -769,5 +717,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -783,5 +731,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -831,8 +779,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -1003,5 +953,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "parametre ''{0}'' zero (null) olamaz"
 
@@ -1009,5 +959,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr ""
 
@@ -1039,5 +989,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "Düzenle"
@@ -1722,14 +1672,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "OSM ye yükle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "Bütün değişiklikleri OSM server'ına yükle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1738,23 +1688,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "Yüklenilecek değişiklik yok."
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#, java-format
+msgid "Synchronize {0} {1} only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1768,17 +1718,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1789,39 +1739,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1933,8 +1884,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "İçeri bilgi alınamadı."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2464,4 +2411,63 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2562,6 +2568,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2586,5 +2592,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr ""
 
@@ -2640,5 +2646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "Yol segmentini ayrıştır"
@@ -2646,6 +2652,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2656,5 +2662,5 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2930,5 +2936,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2947,18 +2953,21 @@
 msgstr "Derece Dakika Saniye"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "G"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "K"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "B"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "D"
@@ -2972,41 +2981,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3024,29 +3055,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr ""
 
@@ -3056,33 +3088,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr ""
 
@@ -3095,12 +3128,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3108,5 +3135,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr ""
 
@@ -3256,5 +3283,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3264,5 +3291,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3272,5 +3299,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3751,5 +3778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "tabaka listede yok."
 
@@ -3812,5 +3839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr ""
 
@@ -3910,5 +3937,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
@@ -3916,15 +3943,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr ""
 
@@ -3980,5 +4007,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -3986,5 +4013,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
@@ -3992,13 +4019,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4006,5 +4034,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr ""
 
@@ -4021,5 +4049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr ""
 
@@ -4030,5 +4058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr ""
 
@@ -4043,5 +4071,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
 
@@ -4053,5 +4081,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr ""
 
@@ -4061,5 +4089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr ""
 
@@ -4067,5 +4095,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr ""
 
@@ -4073,5 +4102,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr ""
@@ -4102,6 +4131,6 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
 msgstr ""
 
@@ -4109,5 +4138,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
+msgid "Adjustable {0} not registered yet."
 msgstr ""
 
@@ -4117,5 +4146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
 
@@ -4123,5 +4152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr ""
 
@@ -4316,5 +4345,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
@@ -4375,5 +4404,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr ""
 
@@ -4381,5 +4410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr ""
 
@@ -4489,14 +4518,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4505,7 +4534,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4568,5 +4595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4589,4 +4616,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4742,5 +4774,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4798,5 +4830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4834,5 +4866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4901,5 +4933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<farklı>"
@@ -5124,6 +5156,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5175,5 +5206,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5399,4 +5429,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5430,5 +5464,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5695,5 +5734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5701,28 +5740,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
 msgstr ""
 
@@ -6835,4 +6873,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "Vazgeç ve Çık"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6846,4 +6888,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "Kaydet ve Çık"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7064,6 +7110,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7178,36 +7227,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps noktası"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
 #: ../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 "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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7215,5 +7264,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7222,5 +7271,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7255,4 +7304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7309,5 +7359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
@@ -7322,5 +7372,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7328,5 +7378,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7431,5 +7481,5 @@
 msgstr "GPX tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7437,32 +7487,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "iz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7470,5 +7505,5 @@
 msgstr[0] "{0} noktalı iz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7476,5 +7511,5 @@
 msgstr[0] "{0} {1} izden oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7601,5 +7636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "Editlemek için bir satır seçiniz."
@@ -7615,5 +7650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7786,4 +7821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8327,5 +8363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "Seçili kaynağı listeden sil."
@@ -8527,33 +8563,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "Seçilebilen Özellikler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "''{1}'' gurubu için ''{0}'' kullan"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "''{0}'' ı kullan"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8564,15 +8601,15 @@
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8581,18 +8618,18 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "Özellikleri Değiştir"
@@ -8622,10 +8659,4 @@
 msgstr "{0} ve {1} arası bilgiler indiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8639,11 +8670,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "Okunamadı \"{0}\""
 
@@ -8662,5 +8692,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "gps iz tanımı"
 
@@ -8724,5 +8754,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8735,5 +8764,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
 
@@ -8745,5 +8774,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8795,5 +8824,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8833,5 +8862,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr ""
 
@@ -8849,5 +8878,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
@@ -8855,5 +8884,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
@@ -8861,5 +8890,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8871,10 +8900,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8893,5 +8916,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr ""
 
@@ -8923,20 +8946,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8949,5 +8967,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8964,6 +8982,12 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
 msgstr ""
 
@@ -8974,15 +8998,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8990,11 +9014,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -9013,5 +9031,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9089,5 +9107,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9095,5 +9113,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9109,15 +9127,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9125,10 +9136,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9136,5 +9148,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9142,5 +9154,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9148,6 +9160,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9160,32 +9172,37 @@
 msgstr "Ayrıştırma sırasında hata oluştu."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9197,5 +9214,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9216,5 +9233,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "Geçersiz obje bulundu id=0"
 
@@ -9223,26 +9240,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9250,10 +9256,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9265,5 +9271,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9271,5 +9277,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9277,6 +9283,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9284,5 +9290,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9291,5 +9297,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9308,10 +9314,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9344,5 +9345,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9357,5 +9358,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr ""
 
@@ -9366,5 +9367,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr ""
 "OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol "
@@ -9372,5 +9373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9380,5 +9381,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9388,5 +9389,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9427,5 +9428,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9824,5 +9825,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9894,5 +9895,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9901,5 +9902,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9908,5 +9909,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9915,5 +9916,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9922,5 +9923,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10060,4 +10061,133 @@
 msgstr "İzleri openstreetmap.org sitesine yükle"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr "Adres İnterpolasyon"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10176,4 +10306,9 @@
 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
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Okunamadı \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10465,13 +10600,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10480,13 +10615,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10838,28 +10973,28 @@
 msgstr "Boş Tabaka"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
+msgid "Is not vectorized."
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgid "Raster size: {0}"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
-msgid "Is not vectorized."
+msgid "Is vectorized."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
-msgid "Is vectorized."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
-#, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10868,14 +11003,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -12263,13 +12398,4 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr ""
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12293,41 +12419,4 @@
 msgid "Optional"
 msgstr ""
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "Kullanıcı"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "Yazar Panosunu göster"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "Kullanıcı Sayfasını Göster"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "Kullanıcı sayfasını tarayıcıda aç"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "Kullanıcı verisi seç"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "Seçimi kullanıcı verisi ile değiştir"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "lütfen bir veri seçiniz"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "Yazar panosunu kullanan bir kullanıcı seçiniz"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "Hata, anonim kullanici ile çalışmaz"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12500,10 +12589,10 @@
 msgstr "Onaylama hatası yok"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "Grid"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12584,12 +12673,30 @@
 msgstr "Diğerlerini Onayla"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "Onayla"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "Veri doğruluğunu kontrol et"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12659,21 +12766,21 @@
 msgstr "\"{0}\" u, \"{1}\" bununla değiştir"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "Sahip çizgisi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "Bu test sahil çizgisi doğrumu diye kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "Sırasız sahil çizgisi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "kesişen yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12681,35 +12788,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 msgstr "kesişine yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Çift Noktalar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../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 "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12717,5 +12824,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12733,18 +12840,18 @@
 msgstr "Çift yol noktaları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "Aynı isimli noktalar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "Bu test aynı isme sahip kavşakları kontrol eder (çift olabilirler)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "Çakışan yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12753,29 +12860,29 @@
 "Bu test, kesişen iki noktanın tek yoldan fazla kullanılmama durumunu inceler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "Üstüste gelen alanlar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "Üstüste gelen Karayolları (alan olarak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "Üstüste gelen demiryolları (alan olarak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "Üstüste Gelen yollar (alan olarak)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "Üstüste gelen yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "Üstüste gelen demiryolları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "Üstüste gelen yollar"
@@ -12791,34 +12898,34 @@
 msgstr "Bu test bazı noktaları birden fazla içeren yolları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "Benzer isimli yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "Bu test yazım hatalarına karşı test yapar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Özellik kontol edici :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
 "Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "Geçersiz etkiket kontrol satırı - {0}: {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "Geçersiz imla yanlışı satırı: {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12829,7 +12936,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Geçersiz etiket/anahtar kombinasyonu"
@@ -12837,60 +12944,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Renklendirme problemi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Anhatar ''{0}'' geçersiz ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Boş değerli etiketler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Geçersiz özellik anahtar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 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:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 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:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Özellik anahtarı HTML bilgisi içeriyor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "Beni Düzelt!"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "Özellik anahtarını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -12898,22 +13005,22 @@
 "kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "Karışık özellik kontrolu kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 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:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "Etiket kontrolcusu kaynağı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12922,130 +13029,130 @@
 "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 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:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "Veri kaynakları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "Özellik değerlerini kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 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:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "Beni Düzelt! leri kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "Renklendirme notlarını kontro let."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 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:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "Varsayılan veri dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 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:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "Varsayılan imla dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 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:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "Özellikler Düzelt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "Eleman tipi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "Uyarı seviyesi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Hatalı söylem ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "Hatatı RegEx ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "Kapanmamış yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "Bu test dairesel yolların kapalı olmasını kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "doğal tip {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "arazi kullanımı tipi {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "Sosyal tip {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "spor tip {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "turizm tip {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "alışveriş tipi {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "dinlenme tipi {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13141,5 +13248,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13155,93 +13262,93 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "alan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "Kapanmamış yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "Bağlantısız yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 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:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 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:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "Yolun sonunda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "Bağlı yolun sonuda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "Etiketsiz ve bağlı olmayan yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 ""
 "Bu test etiketsiz ve herhangi bir yola dahil olmayan noktaları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "Etkitesiz, boş ve tek noktalı yol."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
 msgid "This test checks for untagged, empty and one node ways."
 msgstr "Bu test etiketsiz, boş ve tek noktalı yolları kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "İsimsiz yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "Etiketsiz yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "Boş yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "Tek noktalı yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "Yanlış sıralı yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "Bu test su, yer ve sahilçizgisi yönünü kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 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:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 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:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "Ters çizilmiş yer: kara solda değil"
@@ -13633,6 +13740,11 @@
 msgstr ""
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13641,10 +13753,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13656,10 +13768,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13667,10 +13779,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13679,10 +13791,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13691,20 +13803,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13714,10 +13826,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13725,5 +13837,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13733,10 +13845,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13746,15 +13858,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13762,5 +13874,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13768,5 +13880,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13775,15 +13887,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13792,10 +13904,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13804,15 +13916,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13822,13 +13934,6 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
 msgstr ""
 
@@ -18801,4 +18906,24 @@
 msgstr "stadyum"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19553,10 +19678,4 @@
 msgid "Country code"
 msgstr "Ülke Kodu"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr "Adres İnterpolasyon"
 
 #. item
@@ -25944,4 +26063,7 @@
 #~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz."
 
+#~ msgid "No data imported."
+#~ msgstr "İçeri bilgi alınamadı."
+
 #~ msgid "Data Layer"
 #~ msgstr "Bilgi Tabakası"
@@ -25964,4 +26086,31 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Aktif seçimi veya bütün veriyi onayla."
+
+#~ msgid "User"
+#~ msgstr "Kullanıcı"
+
+#~ msgid "Show Author Panel"
+#~ msgstr "Yazar Panosunu göster"
+
+#~ msgid "Open User Page"
+#~ msgstr "Kullanıcı Sayfasını Göster"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "Kullanıcı sayfasını tarayıcıda aç"
+
+#~ msgid "Select User's Data"
+#~ msgstr "Kullanıcı verisi seç"
+
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "Seçimi kullanıcı verisi ile değiştir"
+
+#~ msgid "Please select some data"
+#~ msgstr "lütfen bir veri seçiniz"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "Yazar panosunu kullanan bir kullanıcı seçiniz"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "Hata, anonim kullanici ile çalışmaz"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -26078,4 +26227,7 @@
 #~ msgstr "Demir parmaklık düzenle"
 
+#~ msgid "Unsaved Changes"
+#~ msgstr "Kaydedilmemiş Değişiklikler"
+
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 17763)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 17764)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 11:11+0200\n"
-"PO-Revision-Date: 2009-09-19 12:05+0000\n"
+"POT-Creation-Date: 2009-09-22 17:52+0200\n"
+"PO-Revision-Date: 2009-09-22 15:12+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
+"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:194
+#: ../core/src/org/openstreetmap/josm/Main.java:190
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Creating main GUI"
@@ -26,5 +26,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:204
+#: ../core/src/org/openstreetmap/josm/Main.java:200
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -33,14 +33,14 @@
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:293
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "無法使用投影法 {0}。改用麥卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:298
-#: ../core/src/org/openstreetmap/josm/Main.java:511
-#: ../core/src/org/openstreetmap/josm/Main.java:519
-#: ../core/src/org/openstreetmap/josm/Main.java:543
-#: ../core/src/org/openstreetmap/josm/Main.java:551
+#: ../core/src/org/openstreetmap/josm/Main.java:294
+#: ../core/src/org/openstreetmap/josm/Main.java:460
+#: ../core/src/org/openstreetmap/josm/Main.java:468
+#: ../core/src/org/openstreetmap/josm/Main.java:492
+#: ../core/src/org/openstreetmap/josm/Main.java:500
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
@@ -77,6 +77,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:617
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:625
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -91,4 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -104,6 +109,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
@@ -111,82 +116,11 @@
 msgstr "錯誤"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid ""
-"There are unsaved changes in {0} layer. Discard the changes and continue?"
-msgid_plural ""
-"There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:453
-msgid "Unsaved Changes"
-msgstr "未儲存的變更"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
-msgstr "存檔後離開"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
-msgid "Discard and Exit"
-msgstr "放棄修改且離開"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-msgid "Cancel"
-msgstr "取消"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:427
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正確的 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:479
-#: ../core/src/org/openstreetmap/josm/Main.java:498
+#: ../core/src/org/openstreetmap/josm/Main.java:428
+#: ../core/src/org/openstreetmap/josm/Main.java:447
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
@@ -208,7 +142,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -222,5 +156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../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
@@ -247,13 +181,13 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/Main.java:446
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/Main.java:518
-#: ../core/src/org/openstreetmap/josm/Main.java:542
-#: ../core/src/org/openstreetmap/josm/Main.java:550
+#: ../core/src/org/openstreetmap/josm/Main.java:459
+#: ../core/src/org/openstreetmap/josm/Main.java:467
+#: ../core/src/org/openstreetmap/josm/Main.java:491
+#: ../core/src/org/openstreetmap/josm/Main.java:499
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
 #, java-format
@@ -394,4 +328,52 @@
 msgid "Merge"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../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/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "取消"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -485,4 +467,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -497,5 +480,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
 msgid "Tool: {0}"
@@ -532,6 +515,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -553,39 +536,4 @@
 msgid "Please select at least three nodes."
 msgstr "請至少選取三個節點"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:105
-msgid "API Capabilities Violation"
-msgstr "違反 API 能力"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:76
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:88
-msgid "Precondition Violation"
-msgstr "違反先決條件"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:100
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
@@ -654,5 +602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 #, java-format
 msgid "File: {0}"
@@ -762,5 +710,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -776,5 +724,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:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -824,8 +772,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -996,5 +946,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, java-format
-msgid "parameter ''{0}'' must not be null"
+msgid "Parameter ''{0}'' must not be null."
 msgstr "參數「{0}」必須不為空值(null)"
 
@@ -1002,5 +952,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
-msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
 
@@ -1032,5 +982,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:633
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Edit"
 msgstr "編輯"
@@ -1706,14 +1656,14 @@
 msgstr "選擇區域是空的"
 
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "上傳至 OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "Upload all changes to the OSM server."
 msgstr "將所有的變更上傳至 OSM 伺服器。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
 #, java-format
 msgid ""
@@ -1722,23 +1672,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
 msgid "Nothing to upload. Get some data first."
 msgstr "沒有要上傳的項目。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
 msgid "No changes to upload."
 msgstr "沒有要上傳的變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "只同步 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
 msgid "Synchronize entire dataset"
 msgstr "同步整個資料組"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
 #, java-format
 msgid ""
@@ -1752,17 +1702,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
 msgid "Conflict detected"
 msgstr "偵測到衝突"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
-#, java-format
-msgid "unexpected return value. Got {0}"
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#, java-format
+msgid "Unexpected return value. Got {0}."
 msgstr "未預期的回傳值。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 #, java-format
 msgid ""
@@ -1776,39 +1726,40 @@
 "<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
-msgid ""
-"<html>Uploading <strong>failed</strong> because you've been "
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
 "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 msgid "Upload to OSM API failed"
 msgstr "上傳至 OSM API 失敗"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1920,8 +1871,4 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data imported."
-msgstr "沒有匯入資料。"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2453,4 +2400,63 @@
 msgstr "與伺服器連線時發生錯誤。"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr "違反 API 能力"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr "違反先決條件"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2551,6 +2557,6 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitmive ''{1}''"
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
 msgstr ""
 
@@ -2575,5 +2581,5 @@
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
+msgid "Cannot resolve undecided conflict."
 msgstr "不能未決定的衝突"
 
@@ -2629,5 +2635,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
 msgid "Split way segment"
 msgstr "分割路徑區段"
@@ -2635,6 +2641,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2645,5 +2651,5 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -2749,7 +2755,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "解決路徑 {0} 的節點清單衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2919,5 +2925,5 @@
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
 #, java-format
-msgid "already registered a conflict for primitive ''{0}''"
+msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
 
@@ -2936,18 +2942,21 @@
 msgstr "度-分-秒格式"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
 msgid "S"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
 msgid "N"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
 msgid "W"
 msgstr "西"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
 msgid "E"
 msgstr "東"
@@ -2961,41 +2970,63 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
-#, java-format
-msgid "parameter {0} > 0 required. Got {1}."
-msgstr "參數 {0} 必須 > 0 。得到 {1}。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "參數「{0}」應為 > 0，得到「{1}」"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
 msgstr ""
@@ -3013,29 +3044,30 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
-msgid "expected id >= 0. Got {0}"
+msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
-msgid "a primitive with id=0 can't be invisible"
+msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
-#, java-format
-msgid "id > 0 expected. Got {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, java-format
+msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
-msgid "version > 0 expected. Got {0}"
+msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
-msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
 msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
 
@@ -3045,33 +3077,34 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
 msgid ""
-"tag collection can't be applied to a primitive because there are keys with "
-"multiple values"
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
-msgid "can't add node {0} to incomplete way {1}"
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history"
+msgid "There's no primitive with version {0} in this history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history"
+msgid "There's no version valid at date ''{0}'' in this history."
 msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
 #, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+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:180
-msgid "no earliest version found. History is empty."
+msgid "No earliest version found. History is empty."
 msgstr "找不到最早的版本。歷史紀錄是空的。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "no latest version found. History is empty."
+msgid "No latest version found. History is empty."
 msgstr "找不到最新的版本。歷史紀錄是空的。"
 
@@ -3084,12 +3117,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr "參數「{0}」應為 > 0，得到「{1}」"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3097,5 +3124,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
 #, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
@@ -3245,5 +3272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -3253,5 +3280,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -3261,5 +3288,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/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -3742,5 +3769,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
-msgid "layer not in list."
+msgid "Layer not in list."
 msgstr "圖層不在清單中。"
 
@@ -3803,5 +3830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
-msgid "role {0} is not participating in compare pair {1}"
+msgid "Role {0} is not participating in compare pair {1}."
 msgstr "角色 {0} 沒有參與比較配對 {1}"
 
@@ -3901,5 +3928,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
-msgid "parameter current out of range: got {0}"
+msgid "Parameter current out of range. Got {0}."
 msgstr "參數目前超出範圍：得到 {0}"
 
@@ -3907,15 +3934,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
-msgid "list in role {0} is currently not participating in a compare pair"
+msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "角色 {0} 中的清單目前沒有參與比較配對"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
-msgid "unexpected value of parameter \"index\". Got {0}"
+msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "參數「index」有未預期的數值。得到 {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
-msgid "item {0} not found in list"
+msgid "Item {0} not found in list."
 msgstr "在清單中找不到項目 {0}"
 
@@ -3971,5 +3998,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"
+msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr "將我選取的元件複製到合併元件清單的結尾"
 
@@ -3977,5 +4004,5 @@
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前"
 
@@ -3983,13 +4010,14 @@
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
-"merged elements"
+"merged elements."
 msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
-msgid "Copy their selected element to the start of the list of merged elements"
+msgid ""
+"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"
+msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr "將他們選取的元件複製到合併元件清單的結尾"
 
@@ -3997,5 +4025,5 @@
 msgid ""
 "Copy their selected elements before the first selected element in the list "
-"of merged elements"
+"of merged elements."
 msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前"
 
@@ -4012,5 +4040,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
-msgid "Move up the selected elements by one position"
+msgid "Move up the selected elements by one position."
 msgstr "將選取的元件向上移動一個位置"
 
@@ -4021,5 +4049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
-msgid "Move down the selected entries by one position"
+msgid "Move down the selected entries by one position."
 msgstr "將選取的項目向下移動一個位置"
 
@@ -4034,5 +4062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
-msgid "Remove the selected entries from the list of merged elements"
+msgid "Remove the selected entries from the list of merged elements."
 msgstr "從合併元件的清單移除選取的項目"
 
@@ -4044,5 +4072,5 @@
 #: ../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"
+msgid "Freeze the current list of merged elements."
 msgstr "凍結合併元件目前的清單"
 
@@ -4052,5 +4080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
-msgid "Unfreeze the list of merged elements and start merging"
+msgid "Unfreeze the list of merged elements and start merging."
 msgstr "將合併元件的清單解除凍結並開始合併"
 
@@ -4058,5 +4086,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
 msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
 
@@ -4064,5 +4093,5 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries</"
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
 "html>"
 msgstr "<html>點選 <strong>{0}</strong> 結束合併我和他們的項目</html>"
@@ -4090,13 +4119,13 @@
 #, java-format
 msgid ""
-"adjustable {0} not registered yet. Can't set participation in synchronized "
-"adjustment"
-msgstr "可調整的 {0} 尚未註冊。不能設定在同步調整中的參與"
+"Adjustable {0} not registered yet. Can't set participation in synchronized "
+"adjustment."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
-msgid "adjustable {0} not registered yet"
-msgstr "可調整的 {0} 尚未註冊"
+msgid "Adjustable {0} not registered yet."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4105,5 +4134,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
-msgid "Merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr "合併的節點尚未凍結。不能建置決議指令"
 
@@ -4111,5 +4140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
-msgid "unexpected column index. Got {0}"
+msgid "Unexpected column index. Got {0}."
 msgstr "未預期的欄位索引。得到 {0}"
 
@@ -4306,5 +4335,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
-msgid "merged nodes not frozen yet. Can't build resolution command"
+msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "合併的節點尚未凍結。不能建置決議指令"
 
@@ -4365,5 +4394,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
-msgid "cannot apply undecided tag merge item"
+msgid "Cannot apply undecided tag merge item."
 msgstr "不能接受未決定的標籤合併項目"
 
@@ -4371,5 +4400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
-msgid "Parameter 'col' must be 0 or 1. Got {0}"
+msgid "Parameter 'col' must be 0 or 1. Got {0}."
 msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
 
@@ -4479,14 +4508,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
-msgid "parameter ''{0}'' must not be empty"
+msgid "Parameter ''{0}'' must not be empty."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
-msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-msgid "tag collection doesn't include the selected value ''{0}''"
+msgid "Tag collection doesn't include the selected value ''{0}''."
 msgstr ""
 
@@ -4495,7 +4524,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
-msgid "Not decided yet"
+msgid "Not decided yet."
 msgstr ""
 
@@ -4558,5 +4585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
-msgid "pos {0} is out of range. current number of members: {1}"
+msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
 
@@ -4579,4 +4606,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+msgid "Not decided yet"
 msgstr ""
 
@@ -4732,5 +4764,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:618
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -4788,5 +4820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
-msgid "index out of bounds Got {0}"
+msgid "Index out of bounds. Got {0}."
 msgstr ""
 
@@ -4824,5 +4856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
+msgid "Display the history of the selected primitive."
 msgstr ""
 
@@ -4891,5 +4923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
 msgid "<different>"
 msgstr "<不同>"
@@ -5114,6 +5146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
-msgid "Edit the relation the currently selected relation member refers to"
+msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
@@ -5165,5 +5196,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5389,4 +5419,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
@@ -5420,5 +5454,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
-msgid "child.getId() >0 expected. Got {1}"
+msgid "Value of child.getId() > 0 expected. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
@@ -5685,5 +5724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
-msgid "history not initialized yet. Failed to set reference primitive."
+msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
@@ -5691,19 +5730,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
-msgid "failed to set reference. reference id {0} doesn't match history id {1}"
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
-msgid "failed to set reference. reference version {0} not available in history"
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
-msgid "history not initialized yet. Failed to set current primitive."
+msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
-msgid "failed to set current. current version {0} not available in history"
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
 msgstr ""
 
@@ -5711,9 +5754,4 @@
 msgid "Load history"
 msgstr "載入歷史紀錄"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "id > 0 expected, got {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
@@ -6825,4 +6863,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+msgid "Discard and Exit"
+msgstr "放棄修改且離開"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
@@ -6836,4 +6878,8 @@
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+msgid "Save and Exit"
+msgstr "存檔後離開"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7054,6 +7100,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
-#, java-format
-msgid "changeset id > 0 expected. Got {1}"
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
@@ -7168,36 +7217,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 msgid "gps point"
 msgstr "gps 點"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 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 "Draw lines between points for this layer."
 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 "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
@@ -7205,5 +7254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -7212,5 +7261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -7245,4 +7294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
 #, java-format
 msgid "Name: {0}"
@@ -7299,5 +7349,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
@@ -7312,5 +7362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -7318,5 +7368,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../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
@@ -7419,5 +7469,5 @@
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7425,32 +7475,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1933 build/trans_presets.java:1939
-#: build/trans_presets.java:1945 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2026
-#: build/trans_presets.java:2033 build/trans_presets.java:2041
-#: build/trans_presets.java:2047 build/trans_presets.java:2053
-#: build/trans_presets.java:2059 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgctxt "gps"
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] "軌跡"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
 msgstr[0] "點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "a track with {0} point"
@@ -7458,5 +7493,5 @@
 msgstr[0] "有 {0} 個點的軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} consists of {1} track"
@@ -7464,5 +7499,5 @@
 msgstr[0] "{0} 由 {1} 軌跡組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, java-format
 msgid "{0} point"
@@ -7587,5 +7622,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
 msgid "Please select the row to edit."
 msgstr "請選擇要編輯的列。"
@@ -7601,5 +7636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -7767,4 +7802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8307,5 +8343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Delete the selected source from the list."
 msgstr "從清單刪除選取的來源。"
@@ -8500,33 +8536,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
 msgid "More information about this feature"
 msgstr "更多關於這個功能的資訊"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:445
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:491
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "使用群組「{1}」的預設組合「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:492
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "使用預設組合「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 msgid "closedway"
 msgstr "封閉路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8537,15 +8574,15 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8554,18 +8591,18 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:686
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:688
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Change Properties"
 msgstr "改變屬性"
@@ -8595,10 +8632,4 @@
 msgstr "正在下載點 {0} 到 {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr ""
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8612,11 +8643,10 @@
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
-msgid "Could not export \"{0}\""
+msgid "Could not export ''{0}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
-#, java-format
-msgid "Could not read \"{0}\""
+#, java-format
+msgid "Could not read ''{0}''."
 msgstr "不能讀取 \"{0}\""
 
@@ -8633,5 +8663,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
-msgid "gps track description"
+msgid "GPS track description"
 msgstr "gps 軌跡描述"
 
@@ -8695,5 +8725,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
 #, java-format
 msgid "File \"{0}\" does not exist"
@@ -8706,5 +8735,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
-msgid "Parse error: invalid document structure for gpx document"
+msgid "Parse error: invalid document structure for GPX document."
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
 
@@ -8716,5 +8745,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
 #, java-format
-msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
 msgstr ""
 
@@ -8766,5 +8795,5 @@
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive"
+"for each primitive."
 msgstr ""
 
@@ -8804,5 +8833,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
-msgid "preference ''{0}'' missing. Can't initialize OsmApi"
+msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
 msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi"
 
@@ -8820,5 +8849,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
-msgid "Communications with {0} established using protocol version {1}"
+msgid "Communications with {0} established using protocol version {1}."
 msgstr "使用 {1} 版協定建立與 {0} 的連線"
 
@@ -8826,5 +8855,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
-msgid "unexpected format of id replied by the server, got ''{0}''"
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "伺服器回覆未預期的 id 格式，取得「{0}」"
 
@@ -8832,5 +8861,5 @@
 #, java-format
 msgid ""
-"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8842,10 +8871,4 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#, java-format
-msgid "id of changeset > 0 required. Got {0}"
 msgstr ""
 
@@ -8864,5 +8887,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
-msgid "No changeset present for diff upload"
+msgid "No changeset present for diff upload."
 msgstr "沒有需要進行差異上傳的資料組合"
 
@@ -8894,20 +8917,15 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
-msgid "current changeset is null. Can't upload data."
+msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
 #, java-format
-msgid "id of current changeset > required. Current id is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
-#, java-format
-msgid "Changeset id > 0 expected. Got {0}"
+msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
 #, java-format
-msgid "Open changeset expected. Got closed changeset with id {0}"
+msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
@@ -8920,5 +8938,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
-msgid "The server replied an error with code {0}"
+msgid "The server replied an error with code {0}."
 msgstr ""
 
@@ -8935,7 +8953,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
-#, java-format
-msgid "missing mandatory attribute ''{0}''"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "缺少必要的屬性「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
@@ -8945,15 +8969,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
 #, java-format
-msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
-msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
-msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -8961,11 +8985,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
 msgstr ""
 
@@ -8984,5 +9002,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgid "Illegal value for attribute ''uid''. Got ''{0}''."
 msgstr ""
 
@@ -9062,5 +9080,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
-msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -9068,5 +9086,5 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</"
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
 "html>"
 msgstr ""
@@ -9082,15 +9100,8 @@
 msgstr "OSM 伺服器檔案(以 gzip 壓縮)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
-#, java-format
-msgid "mandatory attribute ''{0}'' missing"
-msgstr "缺少必要的屬性「{0}」"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -9098,10 +9109,11 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
 msgstr ""
 
@@ -9109,5 +9121,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
 msgstr ""
 
@@ -9115,5 +9127,5 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -9121,6 +9133,6 @@
 #, java-format
 msgid ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
 msgstr ""
 
@@ -9133,32 +9145,37 @@
 msgstr "分析時發生錯誤。"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "檔案「{0}」不存在"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
-msgid "found XML element <nd> element not as direct child of element <way>"
+msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
-msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
-msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
-msgid "Found XML element <member> not as direct child of element <relation>"
+msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
-msgid "Missing attribute ''ref'' on member in relation {0}"
+msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
@@ -9170,5 +9187,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
-msgid "Missing attribute ''type'' on member {0} in relation {1}"
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
@@ -9189,5 +9206,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
-msgid "Illegal object with id=0"
+msgid "Illegal object with ID=0."
 msgstr "不合法的物件，id=0"
 
@@ -9196,26 +9213,15 @@
 #, java-format
 msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.6''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#, java-format
-msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 1, API "
-"version is ''0.5''. Got {1}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
-"WARNING: normalizing value of attribute ''version'' of element {0} to 0, API "
-"version is ''0.5''. Got {1}"
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -9223,10 +9229,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
-msgid "Unknown or unsupported API version. Got {0}"
+msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
-msgid "Missing attribute ''version'' on OSM primitive with id {0}"
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
@@ -9238,5 +9244,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
-msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -9244,5 +9250,5 @@
 #, java-format
 msgid ""
-"way with external id ''{0}'' includes missing node with external id ''{1}''"
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -9250,6 +9256,6 @@
 #, java-format
 msgid ""
-"marked way {0} with {1} nodes incomplete because at least one node was "
-"missing in the loaded data and is therefore incomplete too"
+"Marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too."
 msgstr ""
 
@@ -9257,5 +9263,5 @@
 #, java-format
 msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''"
+"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
 msgstr ""
 
@@ -9264,5 +9270,5 @@
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''"
+"id ''{1}''."
 msgstr ""
 
@@ -9281,10 +9287,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
 #, java-format
-msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#, java-format
-msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9317,5 +9318,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
-msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
+msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
 msgstr ""
 
@@ -9330,5 +9331,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
-msgid "Failed to open connection to API {0}"
+msgid "Failed to open connection to API {0}."
 msgstr "開啟 API {0} 連線失敗"
 
@@ -9339,9 +9340,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
-"Couldn't connect to the osm server. Please check your internet connection."
+"Couldn't connect to the OSM server. Please check your internet connection."
 msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
-msgid "XML tag <user> is missing"
+msgid "XML tag <user> is missing."
 msgstr ""
 
@@ -9351,5 +9352,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
-msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
@@ -9359,5 +9360,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
-msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 
@@ -9398,5 +9399,5 @@
 #, java-format
 msgid ""
-"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
+"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
@@ -9787,5 +9788,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -9857,5 +9858,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"Preference with key ''{0}'' does not include ''{1}''. Can''t restore window "
 "geometry from preferences."
 msgstr ""
@@ -9864,5 +9865,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9871,5 +9872,5 @@
 #, java-format
 msgid ""
-"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
@@ -9878,5 +9879,5 @@
 #, java-format
 msgid ""
-"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
 msgstr ""
@@ -9885,5 +9886,5 @@
 #, java-format
 msgid ""
-"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
 "default geometry. Details: {1}"
 msgstr ""
@@ -10023,4 +10024,133 @@
 msgstr "上傳軌跡至 openstreetmap.org"
 
+#. item "Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: build/trans_presets.java:2278
+msgid "Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
+msgid "Define Address Interpolation"
+msgstr ""
+
+#. Whether to re-trigger data changed for relation
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:414
+msgid "Odd"
+msgstr "奇數"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/terracer/src/terracer/TerracerAction.java:413
+#: ../plugins/terracer/src/terracer/TerracerAction.java:437
+msgid "Even"
+msgstr "偶數"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+msgid "Alphabetic"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#, java-format
+msgid "Relation: {0}"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+msgid "Associate with street using:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+msgid "Numbering Scheme:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+msgid "Starting #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgid "Ending #:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+msgid "City:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+msgid "State:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+msgid "Post Code:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+msgid "Country:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+msgid "Full Address:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+msgid "Optional Information:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+msgid "Expected odd numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+msgid "Expected even numbers for addresses"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+msgid "Country code must be 2 letters"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+msgid "Please enter valid number for starting and ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+msgid "Alphabetic address must end with a letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+msgid "Please enter valid number for starting address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+msgid "Please enter valid number for ending address"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+msgid "Starting address number must be less than ending address number"
+msgstr ""
+
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
@@ -10139,4 +10269,9 @@
 msgid "Error while parsing {0}"
 msgstr "當解析 {0} 時發生錯誤。"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "不能讀取 \"{0}\""
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
@@ -10427,13 +10562,13 @@
 msgstr "選擇自..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:133
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:141
 msgid "Auto sourcing"
 msgstr "自動來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:196
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10445,13 +10580,13 @@
 "您是否想要回復以 F11 作為抓取動作？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid "Restore grab shortcut F11"
 msgstr "回復抓取捷徑鍵 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:205
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止以便讓變更生效。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:267
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
 #, java-format
 msgid ""
@@ -10809,28 +10944,28 @@
 msgstr "空白圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:178
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:180
 msgid "Is not vectorized."
 msgstr "並非向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:181
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:183
 msgid "Is vectorized."
 msgstr "是向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:376
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:368
 #, java-format
 msgid ""
@@ -10841,14 +10976,14 @@
 "建立一個新的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:377
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369
 msgid "Cache Format Error"
 msgstr "快取格式錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:391
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:383
 #, 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:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Lambert Zone Error"
 msgstr "快取蘭勃特區發生錯誤"
@@ -12234,13 +12369,4 @@
 msgstr "連棟建築"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
-msgid "Even"
-msgstr "偶數"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
-msgid "Odd"
-msgstr "奇數"
-
 #: ../plugins/terracer/src/terracer/TerracerAction.java:472
 msgid "Highest number"
@@ -12264,41 +12390,4 @@
 msgid "Optional"
 msgstr "選用性的"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
-msgid "User"
-msgstr "使用者"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
-msgid "Show Author Panel"
-msgstr "顯示作者面板"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
-msgid "Open User Page"
-msgstr "開啟使用者頁面"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
-msgid "Open User Page in browser"
-msgstr "在瀏覽器中開啟使用者頁面"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
-msgid "Select User's Data"
-msgstr "選擇使用者的資料"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
-msgid "Replaces Selection with Users data"
-msgstr "以使用者資料取代選擇區域"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
-msgid "Please select some data"
-msgstr "請選取一些資料"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
-msgid "Please choose a user using the author panel"
-msgstr "請使用作者面板選擇一個使用者"
-
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
-msgid "Sorry, doesn't work with anonymous users"
-msgstr "抱歉，不能用於匿名使用者"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
@@ -12471,10 +12560,10 @@
 msgstr "沒有驗證上的錯誤"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
 msgid "Grid"
 msgstr "格線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
 #, java-format
 msgid ""
@@ -12554,12 +12643,30 @@
 msgstr "驗證其他的"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 msgid "Validation"
 msgstr "驗證"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 msgid "Performs the data validation"
 msgstr "進行資料驗證"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -12629,21 +12736,21 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "Coastlines."
 msgstr "海岸線。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:37
 msgid "This test checks that coastlines are correct."
 msgstr "這會測試海岸線是否正確。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:83
 msgid "Unordered coastline"
 msgstr "未排序的海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
 msgstr "路徑交叉。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -12651,35 +12758,35 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing ways"
 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
+#: ../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:58
+#: ../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:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
 msgid ""
 "This test checks that there are no ways with same tags and same node "
@@ -12687,5 +12794,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
 msgstr ""
@@ -12703,18 +12810,18 @@
 msgstr "重複的路徑節點"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
 msgid "Nodes with same name"
 msgstr "有同樣名稱的節點"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr "這個測試會找出有相同名稱的節點（可能是重複的節點）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
 msgstr "重疊的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
 msgid ""
 "This test checks that a connection between two nodes is not used by more "
@@ -12722,29 +12829,29 @@
 msgstr "這個測試會檢查兩個節點間的連結是否被用於一條以上的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:107
 msgid "Overlapping areas"
 msgstr "重疊的區域"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:112
 msgid "Overlapping highways (with area)"
 msgstr "重疊的公路（含區域）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:117
 msgid "Overlapping railways (with area)"
 msgstr "重疊的鐵路（含區域）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:122
 msgid "Overlapping ways (with area)"
 msgstr "重疊的路徑（含區域）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:128
 msgid "Overlapping highways"
 msgstr "重疊的公路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:133
 msgid "Overlapping railways"
 msgstr "重疊的鐵路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:138
 msgid "Overlapping ways"
 msgstr "重疊的路徑"
@@ -12760,33 +12867,33 @@
 msgstr "這個測試會檢查路徑是否包含自己部分節點超過一次。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:38
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86
 msgid "Similarly named ways"
 msgstr "名稱近似的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
 msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "屬性檢查器："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "無效的標籤檢查行- {0}： {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "無效的拼字檢查行：{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -12797,7 +12904,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "不合法的標籤/數值組合"
@@ -12805,80 +12912,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:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "繪圖問題"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "設定鍵「{0}」無效。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "標籤沒有數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "無效的屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "屬性設定鍵中有無效的空白字元"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "屬性數值以空白字元開頭或結尾"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "屬性數值含有 HTML 標記"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "設定鍵「{0}」不在預設組合裡。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr "預設組合不包含屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, 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:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr "預設組合不包含屬性數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Check property keys."
 msgstr "檢查屬性設定鍵。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "檢查文字清單以驗證屬性設定鍵是有效的。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Use complex property checker."
 msgstr "使用複雜的屬性檢查器。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Validate property values and tags using complex rules."
 msgstr "使用複雜的規則驗證屬性數值。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:623
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../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
 msgid "TagChecker source"
 msgstr "標籤檢查器來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -12888,130 +12995,130 @@
 "openstreetmap.org/index.php/User:JLS/speller）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Add a new source to the list."
 msgstr "將新的來源加入清單。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 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:693
 msgid "Data sources"
 msgstr "資料來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Check property values."
 msgstr "檢查屬性數值。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
 msgid "Validate that property values are valid checking against presets."
 msgstr "驗證屬性數值合於預設組合的要求。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Check for FIXMES."
 msgstr "檢查 FIXMES。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 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:727
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check for paint notes."
 msgstr "檢查繪圖筆記。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
 msgid "Check if map painting found data errors."
 msgstr "檢查地圖繪製是否發現資料錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use default data file."
 msgstr "使用預設的資料檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
 msgid "Use the default data file (recommended)."
 msgstr "使用預設的資料檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default tag ignore file."
 msgstr "使用預設標籤忽略檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default tag ignore file (recommended)."
 msgstr "使用預設標籤忽略檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default spellcheck file."
 msgstr "使用預設的拼字檢查檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default spellcheck file (recommended)."
 msgstr "使用預設的拼字檢查檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
 msgid "Fix properties"
 msgstr "修正屬性"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
 msgid "Could not find element type"
 msgstr "找不到元件類型"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
 msgid "Could not find warning level"
 msgstr "找不到警告等級"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不合法的辭句「{0}」"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "不合法的正規表示式「{0}」"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "Unclosed Ways."
 msgstr "未關閉的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
 msgid "This tests if ways which should be circular are closed."
 msgstr "這會測試圓形的路徑是否已封閉。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
 #, java-format
 msgid "natural type {0}"
 msgstr "自然的類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
 #, java-format
 msgid "landuse type {0}"
 msgstr "土地利用的類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
 #, java-format
 msgid "amenities type {0}"
 msgstr "便利設施類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
 #, java-format
 msgid "sport type {0}"
 msgstr "運動設施類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
 #, java-format
 msgid "tourism type {0}"
 msgstr "旅遊設施類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
 #, java-format
 msgid "shop type {0}"
 msgstr "商店類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
 #, java-format
 msgid "leisure type {0}"
 msgstr "空閒類型 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
 #, java-format
 msgid "waterway type {0}"
@@ -13107,5 +13214,5 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13121,91 +13228,91 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
 #: build/trans_style.java:4194
 msgid "area"
 msgstr "區域"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
 msgid "Unclosed way"
 msgstr "未封閉的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
 msgid "Unconnected ways."
 msgstr "未連接的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "這個測試會檢查路徑的結束點是否非常靠近其他的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
 msgid "Way end node near other highway"
 msgstr "路徑結束點靠近其他的公路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
 msgid "Way end node near other way"
 msgstr "路徑結束點靠近其他的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:130
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
 msgid "Way node near other way"
 msgstr "路徑節點靠近其他的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:148
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
 msgid "Connected way end node near other way"
 msgstr "已連接的路徑結束點靠近其他的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92
 msgid "Untagged and unconnected nodes"
 msgstr "未加標籤與未連接的節點"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../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 "這個測試會檢查未加標籤且不屬任何路徑的一部分的節點。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
 msgid "Untagged, empty and one node ways."
 msgstr "未加標籤、空的和僅一個節點的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59
+#: ../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:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91
 msgid "Unnamed ways"
 msgstr "未命名的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:93
 msgid "Unnamed junction"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
 msgid "Untagged ways"
 msgstr "未加標籤的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105
 msgid "Empty ways"
 msgstr "空的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:109
 msgid "One node ways"
 msgstr "單一節點路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
 msgid "Wrongly Ordered Ways."
 msgstr "排序錯誤的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:34
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
 msgid "This test checks the direction of water, land and coastline ways."
 msgstr "這個測試會檢查水域、陸地和海岸線路徑的方向。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
 msgid "Reversed coastline: land not on left side"
 msgstr "反轉的海岸線：陸地不在左側"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
 msgid "Reversed water: land not on left side"
 msgstr "反轉的水域：陸地不在左側"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
 msgid "Reversed land: land not on left side"
 msgstr "反轉的陸地：陸地不在左側"
@@ -13615,6 +13722,11 @@
 msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
 
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid "Group common Address Interpolation inputs in a single dialog,"
+msgstr ""
+
 #. Plugin AgPifoJ
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:5
 msgid ""
 "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
@@ -13625,10 +13737,10 @@
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:7
 msgid "A special handler for the French land registry WMS server."
 msgstr "用於法國土地登記 WMS 伺服器的特別處理程式。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -13643,10 +13755,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:11
 msgid "Create a grid of ways."
 msgstr "建立路徑的格線。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:13
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -13654,10 +13766,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:15
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "允許直接將多種檔案格式匯入 JOSM。"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -13668,10 +13780,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:19
 msgid "Duplicate Ways with an offset"
 msgstr "重製路徑並位移"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -13680,20 +13792,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:23
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。"
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid "Provide a background layer that displays a map grid"
 msgstr "提供顯示地圖格線的背景圖層"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -13705,10 +13817,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid "Helps vectorizing WMS images."
 msgstr "協助將 WMS 圖片向量化。"
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13716,5 +13828,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -13726,10 +13838,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13741,15 +13853,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13757,5 +13869,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13763,5 +13875,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13770,15 +13882,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin routes
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13787,10 +13899,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13800,15 +13912,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13820,16 +13932,7 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
-
-#. Plugin usertools
-#: build/trans_plugins.java:67
-msgid ""
-"Tools to work with authors/users. Selects map data that belongs to selected "
-"user, opens browser showing selected author profile page."
-msgstr ""
-"與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選取的"
-"作者個人資料頁面。"
 
 #. Plugin utilsplugin
@@ -18803,4 +18906,24 @@
 msgstr "競技揚"
 
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
+msgid "track"
+msgstr ""
+
 #: build/trans_presets.java:1935
 msgid "10pin"
@@ -19555,10 +19678,4 @@
 msgid "Country code"
 msgstr "國碼"
-
-#. item "Buildings/Addresses" text "Country code"
-#. </optional>
-#: build/trans_presets.java:2278
-msgid "Address Interpolation"
-msgstr ""
 
 #. item
@@ -25724,9 +25841,9 @@
 msgstr ""
 
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "參數「{0}」不能為空值(null)"
-
 #~ msgid "unnamed"
 #~ msgstr "未命名的"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "未儲存的變更"
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
@@ -25772,4 +25889,7 @@
 #~ msgstr "更新失敗"
 
+#~ msgid "No data imported."
+#~ msgstr "沒有匯入資料。"
+
 #~ msgid "Data Layer"
 #~ msgstr "資料圖層"
@@ -25826,6 +25946,6 @@
 #~ msgstr "不能開啓偏好設定目錄：{0}"
 
-#~ msgid "- running version is {0}"
-#~ msgstr "- 執行的版本是 {0}"
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "參數「{0}」不能為空值(null)"
 
 #~ msgid "Apply partial resolutions"
@@ -25906,4 +26026,7 @@
 #~ msgstr "無效的投影"
 
+#~ msgid "User"
+#~ msgstr "使用者"
+
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO (GNOME)"
@@ -25944,4 +26067,13 @@
 #~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
 
+#~ msgid "Replaces Selection with Users data"
+#~ msgstr "以使用者資料取代選擇區域"
+
+#~ msgid "Please choose a user using the author panel"
+#~ msgstr "請使用作者面板選擇一個使用者"
+
+#~ msgid "Sorry, doesn't work with anonymous users"
+#~ msgstr "抱歉，不能用於匿名使用者"
+
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。"
@@ -25962,7 +26094,22 @@
 #~ msgstr "匯入 TCX 檔案..."
 
+#~ msgid "Show Author Panel"
+#~ msgstr "顯示作者面板"
+
 #~ msgid "Continue anyway"
 #~ msgstr "強制繼續"
 
+#~ msgid "Please select some data"
+#~ msgstr "請選取一些資料"
+
+#~ msgid "Open User Page in browser"
+#~ msgstr "在瀏覽器中開啟使用者頁面"
+
+#~ msgid "Select User's Data"
+#~ msgstr "選擇使用者的資料"
+
+#~ msgid "Open User Page"
+#~ msgstr "開啟使用者頁面"
+
 #~ msgid "% of lon:"
 #~ msgstr "% 經度："
@@ -25971,4 +26118,11 @@
 #~ msgstr "直接從 JOSM 載入 TCX 檔案。"
 
+#~ msgid ""
+#~ "Tools to work with authors/users. Selects map data that belongs to "
+#~ "selected user, opens browser showing selected author profile page."
+#~ msgstr ""
+#~ "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選"
+#~ "取的作者個人資料頁面。"
+
 #~ msgid "API initialization failed"
 #~ msgstr "API 初始化失敗"
