Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 17708)
+++ 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}\""
