Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 19698)
+++ applications/editors/josm/i18n/po/de.po	(revision 19934)
@@ -9,13 +9,13 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-31 16:51+0100\n"
-"PO-Revision-Date: 2010-01-31 08:13+0000\n"
+"POT-Creation-Date: 2010-02-08 15:25+0100\n"
+"PO-Revision-Date: 2010-02-07 10:57+0000\n"
 "Last-Translator: Andre Hinrichs <andre.hinrichs@gmx.de>\n"
-"Language-Team: Deutsch\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-31 15:34+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 18:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,7 +25,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:314
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
@@ -72,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:742
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:237
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:160
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:497
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:529
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
@@ -175,4 +175,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:167
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
 msgid "Plugins"
@@ -212,5 +213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
@@ -227,4 +228,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
@@ -241,7 +243,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,14 +256,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,6 +272,6 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
@@ -403,5 +405,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
@@ -443,9 +445,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -456,4 +461,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:63
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -481,6 +487,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:844
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:873
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
@@ -584,5 +590,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43
@@ -693,9 +700,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:902
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
@@ -745,42 +752,84 @@
 msgstr "Kartendaten vom OSM-Server herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
+#, fuzzy
+msgid "Download object..."
+msgstr "Inhalt herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
+#, fuzzy
+msgid "Download OSM object by ID."
+msgstr "OSM-Daten herunterladen..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+#, fuzzy
+msgid "Download Object..."
+msgstr "Von OSM-Server herunterladen..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
+msgid "Separate Layer"
+msgstr "Separate Ebene"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
+#, fuzzy
+msgid "Download referrers"
+msgstr "Elemente herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
+#, fuzzy
+msgid "Select if the referrers of the object should be downloaded as well"
+msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
+#, fuzzy
+msgid "Object type:"
+msgstr "Objektgeschichte"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:61
+#, fuzzy
+msgid "Object ID:"
+msgstr "Neue Objekte:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
+#, fuzzy
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+"Bitte geben Sie eine URL ein, von der Daten heruntergeladen werden sollen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:74
+#, fuzzy
+msgid "Download Object"
+msgstr "Daten herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#, fuzzy
+msgid "Download object"
+msgstr "Inhalt herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80
+#, fuzzy
+msgid "Start downloading"
+msgstr "Herunterladen der Daten starten"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
+msgid "Close dialog and cancel downloading"
+msgstr "Fenster schließen und Herunterladen abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 msgid "Download parent ways/relations..."
 msgstr "Elternrelationen, -wege herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:226
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, java-format
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Es trat {0} Konflikt während des Imports auf."
-msgstr[1] "Es traten {0} Konflikte während des Imports auf."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt beim Herunterladen"
-msgstr[1] "Konflikte beim Herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
-#, java-format
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Eltern des Knotens {2} laden"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
-#, java-format
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Eltern des Wegs {2} laden"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258
-#, java-format
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Eltern der Relation {2} laden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -797,12 +846,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
-#, fuzzy
 msgid "Duplicate Layer"
-msgstr "Weg duplizieren"
+msgstr "Ebene duplizieren"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
-#, fuzzy
 msgid "Make a duplicate of the currently selected layer."
-msgstr "Die ausgewählte Relation bearbeiten"
+msgstr "Eine Kopie der aktuellen Ebene anlegen."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
@@ -814,7 +861,7 @@
 #. Translators: "Copy of {layer name}"
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Copy of {0}"
-msgstr "Auf {0} zoomen"
+msgstr "Kopie von {0}"
 
 #. Translators: "Copy {number} of {layer name}"
@@ -822,5 +869,5 @@
 #, java-format
 msgid "Copy {1} of {0}"
-msgstr ""
+msgstr "Kopie {1} von {0}"
 
 #. <button label="Info" hotkey="I">
@@ -1186,7 +1233,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-#, fuzzy
 msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-msgstr "<html>Kann Verzeichnis nicht öffnen.<br>Bitte eine Datei auswählen!"
+msgstr "<html>Kann Verzeichnis nicht öffnen.<br>Bitte Datei wählen!</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
@@ -1219,12 +1265,4 @@
 msgstr "Eine URL öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
-msgid "Separate Layer"
-msgstr "Separate Ebene"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
-
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
@@ -1248,8 +1286,4 @@
 msgstr "Herunterladen der Daten starten"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
-msgid "Close dialog and cancel downloading"
-msgstr "Fenster schließen und Herunterladen abbrechen"
-
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
 msgid "Download Data"
@@ -1257,5 +1291,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-#, fuzzy
 msgid ""
 "<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1265,11 +1298,4 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"Wenn ein oder mehrere Wege ausgewählt sind, wird deren Form so angepasst, "
-"dass alle Winkel 90 oder 180 Grad betragen. <h3>Sie können der Auswahl zwei "
-"Knoten hinzufügen. Dann wird die Ausrichtung durch die beiden Referenzknoten "
-"vorgegeben. (Hinterher können Sie die Verschiebung einzelner Knoten "
-"rückgängig machen:<br>Wählen Sie diese aus und drücken Sie die "
-"Tastenkombination für Rechtwinklig anordnen / Rückgängig machen. Die "
-"Voreinstellung dafür ist Umschalt-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1280,7 +1306,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#, fuzzy
 msgid "Move nodes so all angles are 90 or 270 degrees"
-msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind"
+msgstr "Alle Knoten im Winkel von 90 oder 270 Grad anordnen"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
@@ -1322,7 +1347,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
-#, fuzzy
 msgid "Selection must consist only of ways and nodes."
-msgstr "Ein Multipolygon darf nur aus geschlossenen Wegen bestehen."
+msgstr "Auswahl darf nur Wege oder Knoten beinhalten."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1347,5 +1371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr ""
+msgstr "Bitte Wege mit Winkel von ungefähr 90 oder 180 Grad auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1454,9 +1478,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
@@ -1465,6 +1489,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1473,5 +1497,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
@@ -1489,5 +1513,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
@@ -1522,4 +1546,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
 msgid "Save"
 msgstr "Speichern"
@@ -1629,5 +1656,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -2184,4 +2211,34 @@
 msgstr "Fehler beim Herunterladen"
 
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Es trat {0} Konflikt während des Imports auf."
+msgstr[1] "Es traten {0} Konflikte während des Imports auf."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:182
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt beim Herunterladen"
+msgstr[1] "Konflikte beim Herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:221
+#, java-format
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Eltern des Knotens {2} laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
+#, java-format
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Eltern des Wegs {2} laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
+#, java-format
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Eltern der Relation {2} laden"
+
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
@@ -2328,5 +2385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
@@ -3395,5 +3452,5 @@
 "werden. Die Ausnahme lautet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#: ../core/src/org/openstreetmap/josm/data/Version.java:47
 #, java-format
 msgid "Failed to load resource ''{0}'', error is {1}."
@@ -3401,10 +3458,10 @@
 "Die Ressource ''{0}'' konnte nicht geladen werden. Die Fehlermeldung ist: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/Version.java:93
-#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+#: ../core/src/org/openstreetmap/josm/data/Version.java:98
+#: ../core/src/org/openstreetmap/josm/data/Version.java:161
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
-#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#: ../core/src/org/openstreetmap/josm/data/Version.java:112
 #, java-format
 msgid ""
@@ -3414,5 +3471,5 @@
 "ist ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+#: ../core/src/org/openstreetmap/josm/data/Version.java:145
 msgid "Warning: the revision file ''/REVISION'' is missing."
 msgstr "Warnung: Die Revisions-Datei ''/REVISION'' fehlt."
@@ -3518,6 +3575,7 @@
 
 #. should not happen
-#.
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278
+#. FIXME: this message does not make sense, source version can not be lower than
+#. target version at this point
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:279
 #, java-format
 msgid ""
@@ -3592,19 +3650,19 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:364
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:421
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:423
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:634
 #, java-format
 msgid ""
@@ -3615,5 +3673,5 @@
 "Änderungssatznummer ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1006
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3621,5 +3679,5 @@
 msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1008
 #, java-format
 msgid ""
@@ -3629,127 +3687,8 @@
 "Die ID des Objekts ist {0}, die ID des anderen {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
-msgid ""
-"Tag collection cannot be applied to a primitive because there are keys with "
-"multiple values."
-msgstr ""
-"Merkmalsammlung konnte nicht auf ein Objekt angewendet werden, da sie "
-"Schlüssel mit mehreren Werten enthält."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
-#, java-format
-msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
-"Knoten \"{0}\" konnte nicht zu unvollständigem Weg \"{1}\" hinzugefügt "
-"werden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
-#, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
-"verglichen werden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
-#, java-format
-msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
-msgid "Area style way is not closed."
-msgstr "Flächenförmiger Weg ist nicht geschlossen."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266
-msgid "More than one \"from\" way found."
-msgstr "Mehr als ein Weg mit \"from\" gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272
-msgid "More than one \"to\" way found."
-msgstr "Mehr als ein Weg mit \"to\" gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292
-msgid "More than one \"via\" found."
-msgstr "Mehr als ein Element mit \"via\" gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "Unbekannte Role \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "Unbekannter Elementtyp für \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306
-msgid "No \"from\" way found."
-msgstr "Kein \"from\"-Weg gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310
-msgid "No \"to\" way found."
-msgstr "Kein \"to\"-Weg gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314
-msgid "No \"via\" node or way found."
-msgstr "Kein \"via\"-Knoten oder Weg gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
-msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"from\" way does not start or end at the \"via\" way."
-msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
-msgid "The \"to\" way does not start or end at the \"via\" way."
-msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
-#, java-format
-msgid "Error: {0}"
-msgstr "Fehler: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warnung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
-msgid "inactive"
-msgstr "Inaktiv"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-msgid "selected"
-msgstr "Ausgewählt"
-
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3758,6 +3697,7 @@
 msgstr[1] "Knotenpunkte"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3767,8 +3707,9 @@
 
 #. dark blue
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3777,4 +3718,124 @@
 msgstr[1] "Relationen"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
+msgid ""
+"Tag collection cannot be applied to a primitive because there are keys with "
+"multiple values."
+msgstr ""
+"Merkmalsammlung konnte nicht auf ein Objekt angewendet werden, da sie "
+"Schlüssel mit mehreren Werten enthält."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr ""
+"Knoten \"{0}\" konnte nicht zu unvollständigem Weg \"{1}\" hinzugefügt "
+"werden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr ""
+"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
+"verglichen werden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
+msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
+msgid "Area style way is not closed."
+msgstr "Flächenförmiger Weg ist nicht geschlossen."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266
+msgid "More than one \"from\" way found."
+msgstr "Mehr als ein Weg mit \"from\" gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272
+msgid "More than one \"to\" way found."
+msgstr "Mehr als ein Weg mit \"to\" gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292
+msgid "More than one \"via\" found."
+msgstr "Mehr als ein Element mit \"via\" gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Unbekannte Role \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr "Unbekannter Elementtyp für \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306
+msgid "No \"from\" way found."
+msgstr "Kein \"from\"-Weg gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310
+msgid "No \"to\" way found."
+msgstr "Kein \"to\"-Weg gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314
+msgid "No \"via\" node or way found."
+msgstr "Kein \"via\"-Knoten oder Weg gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323
+msgid "The \"from\" way does not start or end at a \"via\" node."
+msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
+msgid "The \"to\" way does not start or end at a \"via\" node."
+msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
+msgid "The \"from\" way does not start or end at the \"via\" way."
+msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
+msgid "The \"to\" way does not start or end at the \"via\" way."
+msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
+#, java-format
+msgid "Style for restriction {0} not found."
+msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
+#, java-format
+msgid "Error: {0}"
+msgstr "Fehler: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
+#, java-format
+msgid "Warning: {0}"
+msgstr "Warnung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
+msgid "inactive"
+msgstr "Inaktiv"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
+msgid "selected"
+msgstr "Ausgewählt"
+
 #. teal
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
@@ -3789,5 +3850,5 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
@@ -3931,5 +3992,5 @@
 msgstr "<html>Konnte Lesezeichen nicht schreiben.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:198
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
@@ -3974,5 +4035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
@@ -4032,4 +4093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
 msgid "Conflict"
 msgstr "Konflikt"
@@ -4044,5 +4106,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
-#, fuzzy
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
@@ -4058,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4286,15 +4347,15 @@
 msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
 msgid "File"
 msgstr "Datei"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:193
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:208
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
@@ -4305,19 +4366,19 @@
 msgstr "Bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
 msgid "View"
 msgstr "Ansicht"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Vorlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:193
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:195
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:59
@@ -4328,5 +4389,5 @@
 msgstr "Menü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
 msgid "Audio"
 msgstr "Audio"
@@ -4498,5 +4559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4541,12 +4602,12 @@
 msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
@@ -4556,6 +4617,6 @@
 msgstr "Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:243
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4563,6 +4624,6 @@
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:238
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
@@ -4570,9 +4631,9 @@
 msgstr "Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:166
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 msgid "No pending tag conflicts to be resolved"
 msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
 #, java-format
 msgid "Tags({0} conflict)"
@@ -4581,5 +4642,5 @@
 msgstr[1] "Merkmale ({0} Konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 #, java-format
 msgid "{0} pending tag conflict to be resolved"
@@ -4588,9 +4649,9 @@
 msgstr[1] "{0} verbleibende Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
 msgid "Nodes(resolved)"
 msgstr "Knoten(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -4599,17 +4660,17 @@
 "Knotenliste des Weges."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
 msgid "Nodes(with conflicts)"
 msgstr "Knoten(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:182
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Pending conflicts in the node list of this way"
 msgstr "Verbleibende Konflikte in der Knotenliste des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
 msgid "Members(resolved)"
 msgstr "Elemente(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4619,68 +4680,79 @@
 "Elementenliste der Relation."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "Members(with conflicts)"
 msgstr "Elemente(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Verbleibende Konflikte in der Elementenliste der Relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
 msgid "No pending property conflicts"
 msgstr "Keine verbleibenden Eigenschaftskonflikte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
 msgid "Properties(with conflicts)"
 msgstr "Eigenschaften(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:203
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
 msgid "Pending property conflicts to be resolved"
 msgstr "Verbleibende Eigenschaftskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
 msgid "Conflict Resolution"
 msgstr "Konfliktlösung"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:334
+#, fuzzy, java-format
+msgid "{0} more..."
+msgstr "{0}, ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:336
+#, fuzzy, java-format
+msgid "Following primitives could not be added because they are deleted: {0}"
+msgstr ""
+"Objekt {0} kann nicht zur Relation hinzugefügt werden, weil es gelöscht wurde"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
 #, java-format
 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:737
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:777
 #, java-format
 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:751
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:791
 #, java-format
 msgid "Item {0} not found in list."
 msgstr "Element {0} nicht in der Liste gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237
 msgid "lock scrolling"
 msgstr "Synchron rollen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245
 msgid "Compare "
 msgstr "Vergleichen "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
 msgid "My version"
 msgstr "Meine Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Liste der Elemente in meinem (dem lokalen) Datensatz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
 msgid "Merged version"
 msgstr "Vereinigte Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -4690,32 +4762,32 @@
 "hierdurch ersetzt, wenn die Änderungen bestätigt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
 msgid "Their version"
 msgstr "Deren Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Liste der Elemente in deren (dem Server-) Datensatz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
 msgid "> top"
 msgstr "> Kopf"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 "Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
 msgid "> bottom"
 msgstr "> Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
 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."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -4725,5 +4797,5 @@
 "vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -4733,5 +4805,5 @@
 "Liste vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
@@ -4740,10 +4812,10 @@
 "Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
 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."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -4753,5 +4825,5 @@
 "vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -4761,23 +4833,32 @@
 "vereinigten Liste kopieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
+#, fuzzy
+msgid "Use all mine elements"
+msgstr "Einzelne Elemente"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
+msgid "Use all their elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Up"
 msgstr "Hoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Move up the selected elements by one position."
 msgstr "Den ausgewählten Eintrag eine Position nach oben schieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Down"
 msgstr "Runter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730
 msgid "Move down the selected entries by one position."
 msgstr "Den ausgewählten Eintrag eine Position nach unten schieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
@@ -4788,28 +4869,28 @@
 msgstr "Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762
 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."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828
 msgid "Freeze"
 msgstr "Fixieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829
 msgid "Freeze the current list of merged elements."
 msgstr "Aktuelle Liste der vereinigten Elemente fixieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
 msgid "Unfreeze"
 msgstr "Fixierung aufheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
 msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:779
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850
 #, java-format
 msgid ""
@@ -4818,5 +4899,5 @@
 msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen zu beginnen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:784
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
 #, java-format
 msgid ""
@@ -4826,5 +4907,5 @@
 "<html>Wähle <strong>{0}</strong> um das Vereinigen abzuschließen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:802
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
 #, java-format
 msgid "My version ({0} entry)"
@@ -4833,5 +4914,5 @@
 msgstr[1] "Meine Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:805
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4840,5 +4921,5 @@
 msgstr[1] "Vereinigte Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:808
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4847,5 +4928,5 @@
 msgstr[1] "Deren Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:871
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
@@ -4857,5 +4938,5 @@
 "synchronen Anpassen teilnehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:886
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
@@ -4867,5 +4948,5 @@
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
@@ -4873,11 +4954,5 @@
 "ausgeführt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
-#, java-format
-msgid "Node {0} cannot be added to the way because it was deleted"
-msgstr ""
-"Knoten {0} kann nicht zum Weg hinzugefügt werden, weil er gelöscht wurde"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
 #, java-format
 msgid ""
@@ -4887,19 +4962,19 @@
 "<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 msgid "Communication with server failed"
 msgstr "Fehler bei der Kommunikation mit dem Server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
 msgid "Yes, undelete them too"
 msgstr "Ja, auch wiederherstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:500
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
 msgid "No, cancel operation"
 msgstr "Nein, Operation abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
 #, java-format
 msgid ""
@@ -4917,9 +4992,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
 msgid "Undelete additional nodes?"
 msgstr "Zusätzliche Knoten wiederherstellen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
 #, java-format
 msgid ""
@@ -4938,13 +5013,13 @@
 "auch wiederhergestellt werden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
 msgid "Undelete dependent primitives?"
 msgstr "Abhängige Objekte wiederherstellen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4954,92 +5029,98 @@
 "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
 msgid "Coordinates:"
 msgstr "Koordinaten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
 msgid "Deleted State:"
 msgstr "Löschstatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Löschstatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
+#, fuzzy
+msgid "Referenced by:"
+msgstr "Referenz"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(nichts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
 msgid "not deleted"
 msgstr "nicht gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
 msgid "visible (on the server)"
 msgstr "sichtbar (auf Server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
 msgid "not visible (on the server)"
 msgstr "nicht sichtbar (auf dem Server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
 msgid "Keep a clone of the local version"
 msgstr "Exakte Kopie der lokalen Version behalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
 msgid "Physically delete from local dataset"
 msgstr "Aus dem lokalen Datensatz löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
 msgid "Keep my coordiates"
 msgstr "Behalte meine Koordinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
 msgid "Keep their coordiates"
 msgstr "Server-Koordinaten behalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
 msgid "Undecide conflict between different coordinates"
 msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
 msgid "Keep my deleted state"
 msgstr "Löschstatus der lokalen Daten behalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
 msgid "Keep their deleted state"
 msgstr "Löschstatus der Server-Daten behalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
 msgid "Undecide conflict between deleted state"
 msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
 msgid "Keep my visible state"
 msgstr "Übernehme meinen Löschstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Yes, reset the id"
 msgstr "Ja, diese ID zurücksetzten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Nein, abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
 #, java-format
 msgid ""
@@ -5052,17 +5133,17 @@
 "zuweisen.<br>Möchten Sie fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
 msgid "Reset id to 0"
 msgstr "ID auf 0 zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
 msgid "Keep their visible state"
 msgstr "Übernehme deren Löschstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
 msgid "Yes, purge it"
 msgstr "Ja, entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
 #, java-format
 msgid ""
@@ -5073,9 +5154,9 @@
 "damit einverstanden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
 msgid "Remove from dataset"
 msgstr "Aus dem Datensatz löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
 msgid "Undecide conflict between visible state"
 msgstr "Löschstatus ist unterschiedlich."
@@ -5086,11 +5167,5 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
-#, java-format
-msgid "Primitive {0} cannot be added to the relation because it was deleted."
-msgstr ""
-"Objekt {0} kann nicht zur Relation hinzugefügt werden, weil es gelöscht wurde"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5126,6 +5201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -5139,6 +5214,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5155,25 +5230,25 @@
 msgstr "Unentschiedenes Merkmalselement kann nicht angewendet werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
 msgid "My version (local dataset)"
 msgstr "Meine Version (lokale Daten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
 msgid "Their version (server dataset)"
 msgstr "Deren Version (Serverdaten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
 msgid "Undecide"
 msgstr "Unentschieden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
 msgid "Mark the selected tags as undecided"
 msgstr "Gewähltes Merkmal als unentschieden markieren"
@@ -5306,5 +5381,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
@@ -5316,5 +5391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
@@ -5531,5 +5606,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5551,13 +5626,18 @@
 msgstr "Konflikte auflösen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#, fuzzy, java-format
+msgid "Conflicts: {0} unresolved"
+msgstr "Es sind keine Konflikte zu lösen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
 msgid "Resolve"
 msgstr "Auflösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
@@ -5568,44 +5648,43 @@
 "Objekte setzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "Konfliktauflösung abbrechen und Fenster schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "Gelöste Konflikte anwenden und Fenster schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
 msgid "Apply Resolution"
 msgstr "Lösung anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Close anyway"
 msgstr "Trotzdem schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
 msgid "Continue resolving"
 msgstr "Weiter auflösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
 #, java-format
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
 "<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences will not be applied.</"
-"strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
+"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
+"Already<br>resolved differences will not be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
 msgid "Conflict not resolved completely"
 msgstr "Konflikt konnte nicht vollständig gelöst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
 msgid "Resolve conflicts"
 msgstr "Konflikte auflösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
@@ -5617,7 +5696,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:195
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
@@ -5630,4 +5709,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
 msgid "Add filter."
 msgstr "Filter hinzufügen."
@@ -5678,11 +5760,11 @@
 msgstr "Versionsprotokoll aller gewählten Objekte anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 msgid "Object with history"
 msgstr "Objekt mit Geschichte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
@@ -5690,13 +5772,13 @@
 msgstr "Neu laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:273
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Alle ausgewählten Objekte neu laden und die Liste aktualisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:313
 msgid "Display the history of the selected objects."
 msgstr "Geschichte der markierten Elemente anzeigen."
@@ -5737,7 +5819,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
-#, fuzzy
 msgid "Duplicate this layer"
-msgstr "Weg duplizieren"
+msgstr "Diese Ebene duplizieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
@@ -5827,10 +5908,10 @@
 msgstr "Auf Auswahl zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:297
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5838,5 +5919,5 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:351
 #, java-format
 msgid "Selection: {0}"
@@ -5937,5 +6018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
 msgid "Close the dialog"
 msgstr "Dialog schließen"
@@ -7102,5 +7183,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
-msgid "Enter a changset id"
+msgid "Enter a changeset id"
 msgstr "Eine Änderungssatz-ID eingeben"
 
@@ -7122,4 +7203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
 msgid "Please enter an integer value > 0"
 msgstr "Bitte geben Sie eine positive Ganzzahl ein"
@@ -7319,9 +7401,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
 msgid ""
-"<html>Select to restrict the query to your changsets only.<br>Unselect to "
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
 "include all changesets in the query.</html>"
 msgstr ""
-"<html>Anwählen, um nur eigene Änderungsgruppen abzufragen.<br>Abwählen, um "
-"alle Änderungsgruppen abzufragen.</html>"
+"<html>Anwählen, um nur eigene Änderungssätze abzufragen.<br>Abwählen, um "
+"alle Änderungssätze abzufragen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7419,5 +7501,5 @@
 msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 #, java-format
 msgid "This will change {0} object."
@@ -7426,22 +7508,23 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:185
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:114
 msgid "<different>"
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:377
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:310
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7450,5 +7533,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:350
 #, java-format
 msgid "This will change up to {0} object."
@@ -7457,85 +7540,85 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:365
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:437
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:580
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:823
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:826
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:879
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:903
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:905
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:948
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984
 msgid "Select relation"
 msgstr "Relation auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:985
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -7814,6 +7897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
-msgid ""
-"Click to to return to the relation editor and to resume relation editing"
+msgid "Click to return to the relation editor and to resume relation editing"
 msgstr ""
 "Klicken, um zum Relationseditor zurückzukehren und das Editieren der "
@@ -8025,11 +8107,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
-#, fuzzy
 msgid ""
 "<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
 "maxlat): </html>"
 msgstr ""
-"<html><strong>Aktueller Ladebereich</strong> (min. Breite, min. Länge, max. "
-"Br., max. Län.): {0}, {1}, {2}, {3}</html>"
+"<html><strong>Aktueller Ladebereich</strong> (min. Länge, min. Breite, max. "
+"L., max. Br.): </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
@@ -8160,5 +8241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten"
+msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich ablehnen"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:221
@@ -8172,5 +8253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
 msgid "Click do download the currently selected area"
-msgstr "Klicken, um den aktuellen Ladebereich zu laden"
+msgstr "Klicken, um den aktuellen Bereich zu laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
@@ -8275,4 +8356,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
@@ -8351,7 +8435,7 @@
 "is not available yet. It is missing both in your local language ({1}) and in "
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
-"missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
-"p></html>"
+"missing information. You can both edit the <a href=\"{2}\">help topic in "
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
 msgstr ""
 "<html><p class=\"warning-header\">Hilfe-Seite für ein Hilfe-Thema fehlt</"
@@ -8381,5 +8465,5 @@
 msgid ""
 "<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
+"network problem, please check<br>your internet connection</html>"
 msgstr ""
 "<html>Die Hilfe-Seite unter der URL  {0} konnte nicht geöffnet werden."
@@ -8432,5 +8516,5 @@
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Warnung: Falsche Position im HTML Dokument. Der Fehler war: {0}"
+msgstr "Warnung: Falsche Position im HTML-Dokument. Der Fehler war: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8469,5 +8553,5 @@
 msgstr "Versionsprotokoll für Relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:141
 msgid "Reload the history from the server"
 msgstr "Versionsprotokoll erneut vom Server laden"
@@ -8877,5 +8961,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
-msgid "Please enter the password name of your OSM account"
+msgid "Please enter the password of your OSM account"
 msgstr "Passwort Ihres OSM-Zugangs eingeben"
 
@@ -8949,9 +9033,9 @@
 #, java-format
 msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exceptions "
+"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
 "was: {0}"
 msgstr ""
 "Warnung: Informationen zum aktuellen JOSM-Nutzer konnten nicht abgerufen "
-"werden. Ausnahmefehler: {0}"
+"werden. Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -8998,5 +9082,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr "Ebene \"{0}\" enthält Änderungen, die gespeichert werden sollten."
+msgstr "Ebene \"{0}\" enthält keine Änderungen zum Speichern."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
@@ -9438,5 +9522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
 msgid "Continue uploading"
 msgstr "Mit Hochladen fortfahren"
@@ -9465,5 +9549,5 @@
 #, java-format
 msgid ""
-"The server reported that the current changset was closed.<br>This is most "
+"The server reported that the current changeset was closed.<br>This is most "
 "likely because the changesets size exceeded the max. size<br>of {0} objects "
 "on the server ''{1}''."
@@ -9484,5 +9568,5 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
 "<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
 "editing.<br>"
@@ -9527,5 +9611,5 @@
 "Fehlermeldung war: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
 msgid ""
 "<html>Mark modified objects <strong>from the current selection</strong> to "
@@ -9535,5 +9619,5 @@
 "strong>, die zum Server hochgeladen werden sollen. </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
 msgid ""
 "<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
@@ -9543,9 +9627,9 @@
 "gelöscht werden sollen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
 msgid "Select objects to upload"
 msgstr "Objekte zum Hochladen auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
 msgid "Cancel uploading"
 msgstr "Hochladen abbrechen"
@@ -9861,5 +9945,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:637
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10010,18 +10094,18 @@
 msgstr "API-Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
 msgid "Dataset consistency test"
 msgstr "Datensatzkonsistenzprüfung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
 msgid "No problems found"
 msgstr "Keine Probleme gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
 msgid "Following problems found:"
 msgstr "Folgende Probleme gefunden:"
@@ -10073,24 +10157,24 @@
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-Dateien (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10102,34 +10186,34 @@
 "dem Foto und wählen eine Zeitzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
 msgid "Photo time (from exif):"
 msgstr "Fotozeit (aus EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-Zeit (aus obigem Photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
 msgid "I am in the timezone of: "
 msgstr "Ich bin in der Zeitzone von: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
 msgid "No date"
 msgstr "Kein Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
 msgid "Open another photo"
 msgstr "Ein anderes Foto öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Zeit von Foto und GPS-Empfänger synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid ""
 "Error while parsing the date.\n"
@@ -10139,21 +10223,21 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
 msgid "<No GPX track loaded yet>"
 msgstr "<Bisher keine GPS-Daten geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
 msgid "GPX track: "
 msgstr "GPS-Spur: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
 msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10162,39 +10246,39 @@
 "Empfängers</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
 msgid "Auto-Guess"
 msgstr "Automatisch ermitteln"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
 msgid "Manual adjust"
 msgstr "Manuell justieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Override position for: "
 msgstr "Position überschreiben für: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Fotos mit Ortsinformationen in EXIF-Daten ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Bilder die bereits markiert sind ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
 msgid "Show Thumbnail images on the map"
 msgstr "Vorschaubilder auf der Karte anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
 msgid "No gpx selected"
 msgstr "Keine GPS-Spur ausgewählt"
@@ -10301,5 +10385,5 @@
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1265
 #, java-format
 msgid ""
@@ -10310,5 +10394,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1335
 #, java-format
 msgid ""
@@ -10362,5 +10446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
@@ -10370,5 +10454,5 @@
 msgstr "Mit GPX korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:334
 #, java-format
 msgid "{0} image loaded."
@@ -10377,5 +10461,5 @@
 msgstr[1] "{0} Bilder geladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:335
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10384,10 +10468,10 @@
 msgstr[1] "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:105
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:610
 #, java-format
 msgid ""
@@ -10398,5 +10482,5 @@
 "</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 msgid "Image file could not be deleted."
 msgstr "Bilddatei konnte nicht gelöscht werden."
@@ -10417,55 +10501,55 @@
 msgstr "Fehler bei Datei {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
 msgid "Display geotagged images"
 msgstr "Stelle georefernzierte Bilder dar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:83
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87
 msgid "Show previous Image"
 msgstr "Vorheriges Bild zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:99
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoimage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:94
 msgid "Remove photo from layer"
 msgstr "Photo aus Ebene entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109
 msgid "Delete File from disk"
 msgstr "Datein von Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:116
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Nächstes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Show next Image"
 msgstr "Nächstes Bild zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:127
 msgid "Center view"
 msgstr "Anzeige zentrieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:130
 msgid "Zoom best fit and 1:1"
 msgstr "Passend zoomen und 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:133
 msgid "Move dialog to the side pane"
 msgstr "Dialog in die Seitenleiste verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:243
 #, java-format
 msgid ""
@@ -10476,5 +10560,5 @@
 "Höhe: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:246
 #, java-format
 msgid ""
@@ -10749,7 +10833,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
-#, java-format
-msgid ""
-"<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
+#, fuzzy, java-format
+msgid ""
+"<html>You have successfully retrieved an OAuth Access Token from the OSM "
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
@@ -11819,5 +11903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
@@ -11835,5 +11919,5 @@
 msgstr "MapPaint Stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:69
 #, java-format
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
@@ -11845,5 +11929,5 @@
 "heruntergeladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 #, java-format
 msgid "Downloading the following plugin has <strong>failed</strong>:"
@@ -11855,65 +11939,70 @@
 "Die folgenden Plugins konnten <strong>nicht</strong> heruntergeladen werden:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:117
 msgid "Search:"
 msgstr "Suche:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:122
 msgid "Enter a search expression"
 msgstr "Suchbegriff eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:168
+#, fuzzy
+msgid "Plugin update policy"
+msgstr "Plugin-Aktualisierung fehlgeschlagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:199
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
 msgid "Enter URL"
 msgstr "URL eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:236
 msgid "Please select an entry."
 msgstr "Bitte einen Eintrag wählen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:221
 msgid "Edit JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei ändern."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:222
 msgid "JOSM Plugin description URL"
 msgstr "URL der JOSM Plugin Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:234
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:249
 msgid "Configure Plugin Sites"
 msgstr "Pluginquellen bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:312
 msgid "Download list"
 msgstr "Liste herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:313
 msgid "Download the list of available plugins"
 msgstr "Liste aller verfügbaren Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:356
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:360
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:372
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:621
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:777
 msgid "Update plugins"
 msgstr "Plugins aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343
 msgid "Update the selected plugins"
 msgstr "Ausgewählte Plugins aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:395
 msgid "Configure sites..."
 msgstr "Quellen konfigurieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:396
 msgid "Configure the list of sites where plugins are downloaded from"
 msgstr ""
@@ -12293,9 +12382,9 @@
 "Der Eintrag ist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Sort presets menu"
 msgstr "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
 msgid "Tagging Presets"
 msgstr "Objektvorlagen"
@@ -12322,8 +12411,10 @@
 msgstr "Die Elemente auf der Werkzeugleiste anpassen."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:65
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM ausgeliefert"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:84
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:84
 msgid ""
@@ -12334,8 +12425,41 @@
 "verfügbaren Plugins herunterzuladen und anzuzeigen."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:112
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
 msgstr "{0}: Version {1} (lokal: {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
+msgid "Ask before updating"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
+msgid "Always update withouth asking"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123
+#, fuzzy
+msgid "Never update"
+msgstr "Route umdrehen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins at "
+"startup after an update of JOSM itself."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
+msgid "Update interval (in days):"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins after a "
+"certain periode of time."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
@@ -12448,5 +12572,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
 msgid "OSM password:"
-msgstr "OSM Passwort:"
+msgstr "OSM-Passwort:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
@@ -12648,5 +12772,5 @@
 msgstr "Auswahl in der Merkmalstabelle löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:337
 #, java-format
 msgid ""
@@ -12654,6 +12778,8 @@
 "be the same as in values"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
+"Defekte Objektvorlage ''{0}-{1}'' - Die Anzahl der Werte in "
+"''display_values'' muss mit der Anzahl in ''values'' identisch sein."
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:463
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12661,18 +12787,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:486
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577
 msgid "closedway"
 msgstr "geschlossener Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:665
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12683,15 +12809,15 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:704
 #, 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:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 #: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
@@ -12701,17 +12827,17 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:770
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:772
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:855
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
@@ -12750,4 +12876,12 @@
 "URL von www.openstreetmap.org (Sie können hier einen Download-URL "
 "hineinkopieren, um einen Bereich anzugeben)"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
+#, fuzzy
+msgid ""
+"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgstr ""
+"Der Wert ist keine gültige Benutzernummer. Bitte geben Sie eine positive "
+"Ganzzahl ein."
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -13073,9 +13207,8 @@
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
-"Warnung: die Nachricht des Tages konnte nicht von ''{0}'' gelesen werden. "
-"Fehlermeldung war: {1}"
+"Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -13340,5 +13473,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:129
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -13424,6 +13557,6 @@
 "({1},{2}). Skipping."
 msgstr ""
-"Warnung: nicht unterstützes Endelement ''{0}'' im changeset Inhalt an der "
-"Position ({1},{2}) übersprungen."
+"Warnung: nicht unterstütztes Endelement ''{0}'' im Inhalt des "
+"Änderungssatzes an der Position ({1},{2}) übersprungen."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13454,5 +13587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:160
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:125
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13461,5 +13594,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:167
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:132
 #, java-format
 msgid "Unsupported version: {0}"
@@ -13501,6 +13634,6 @@
 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>"
-"{0}</html>"
+"<html>Beim Speichern ist ein Fehler aufgetreten.<br>Der Fehler lautet:<br>{0}"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
@@ -13511,5 +13644,5 @@
 msgstr ""
 "<html>Beim Wiederherstellen der Sicherheitskopie ist ein Fehler aufgetreten."
-"<br>Der Fehler lautet: <br>{0}</html>"
+"<br>Der Fehler lautet:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
@@ -13532,14 +13665,5 @@
 msgstr "Die Datei \"{0}\" existiert nicht"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:112
-#, java-format
-msgid ""
-"Warning: ignoring changeset id {0} for new object with external id {1} and "
-"internal id {2}"
-msgstr ""
-"Warnung: ignoriere changeset id {0} für neues Object mit externer id {1} und "
-"interner id {2}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:156
 #, java-format
 msgid ""
@@ -13550,19 +13674,24 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:185
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Das XML-Element <nd> ist kein unmittelbares Kindelement von <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> des Wegs {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element <nd>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#, fuzzy, java-format
+msgid "Deleted way {0} contains nodes"
+msgstr "{0} Knoten löschen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:220
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -13570,10 +13699,10 @@
 "gefunden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:280
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:285
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -13581,10 +13710,10 @@
 "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:289
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:292
+msgstr "Fehlendes Attribut \"type\" bei Mitglied {0} der Relation {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid ""
@@ -13594,9 +13723,14 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:299
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#, fuzzy, java-format
+msgid "Deleted relation {0} contains members"
+msgstr "Relation {0} löschen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -13605,10 +13739,10 @@
 "Dieses wird ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
 msgid "Illegal object with ID=0."
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:365
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320
 #, java-format
 msgid ""
@@ -13620,8 +13754,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:371
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:393
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
 #, java-format
 msgid ""
@@ -13634,10 +13768,10 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:390
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -13645,6 +13779,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:420
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:430
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
 #, java-format
 msgid ""
@@ -13656,6 +13790,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:424
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:386
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
@@ -13664,15 +13798,15 @@
 "Dies ist für eine existierende Primitive eine Problem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Fehlendes erforderliches Attribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:421
 #, java-format
 msgid ""
@@ -13682,22 +13816,19 @@
 "mit externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
-#, 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."
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:433
+#, fuzzy, java-format
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Knoten oder Wege löschen."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
+#, fuzzy, java-format
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
 msgstr ""
 "Der Weg mit der ID {0} wird als unvollständig markiert, weil mindestens "
 "einer seiner {1} Knoten in den geladenen Daten fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
-#, java-format
-msgid ""
-"Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-msgstr ""
-"Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
-"externer ID ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -13708,13 +13839,18 @@
 "externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512
+#, fuzzy, java-format
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:539
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:594
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540
 msgid "Parsing OSM data..."
 msgstr "OSM-Daten einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:599
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:545
 msgid "Preparing data set..."
 msgstr "Datensatz wird vorbereitet ..."
@@ -13784,5 +13920,5 @@
 "Could not connect to the OSM server. Please check your internet connection."
 msgstr ""
-"Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
+"Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen Sie Ihre "
 "Internetverbindung."
 
@@ -13857,5 +13993,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
 msgid "Unexpected id 0 for osm primitive found"
-msgstr "Unerwartete id 0 für OSM Primitive gefunden."
+msgstr "Unerwartete Id 0 für OSM-Primitive gefunden."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:89
@@ -13956,5 +14092,35 @@
 msgstr "Die Aktualisierung der aktivierten Plugins auslassen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
+msgid ""
+"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
+"disabled."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+msgid ""
+"Skipping plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
+msgid ""
+"Running plugin update after JOSM upgrade. Automatic update at startup is "
+"enabled."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
+msgid ""
+"Running plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
+#, fuzzy, java-format
+msgid ""
+"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
+msgstr "Warnung: unerwünschter Vorzugswert für ''{0}'' war ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
 #, java-format
 msgid ""
@@ -13966,5 +14132,5 @@
 msgstr[1] "Das Plugin {0} benötigt zusätzlich die folgenden Plugins:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #, java-format
 msgid ""
@@ -13976,10 +14142,10 @@
 "aktualisiert werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
 #, java-format
 msgid "loading plugin ''{0}''"
 msgstr "Plugin {0} laden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -13987,18 +14153,18 @@
 "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:405
 msgid "Loading plugins ..."
 msgstr "Plugins laden..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:406
 msgid "Checking plugin preconditions..."
 msgstr "Plugin-Anforderungen prüfen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:433
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr "Plugin {0} laden..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:514
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -14006,5 +14172,5 @@
 msgstr[1] "JOSM konnte keine Informationen über die folgenden Plugins finden:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -14012,17 +14178,17 @@
 msgstr[1] "Diese Plugins werden nicht geladen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Determine plugins to load..."
 msgstr "Herausfinden, welche Plugins geladen werden sollen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Removing deprecated plugins..."
 msgstr "Veraltete Plugins entfernen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:556
 msgid "Removing umaintained plugins..."
 msgstr "Nicht mehr gewartete Plugins entfernen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:580
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -14030,5 +14196,5 @@
 msgstr[1] "Die folgenden Plugins konnten nicht aktualisiert werden:"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:591
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -14044,31 +14210,31 @@
 "Sie die Aktualisierung manuell durch."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:599
 msgid "Plugin update failed"
 msgstr "Plugin-Aktualisierung fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:638
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:655
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:670
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:748
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:657
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr "Plugin \"{0}\" entfernen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:661
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:754
 msgid "Keep plugin"
 msgstr "Plugin behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:663
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:756
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Plugin \"{0}\" behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:732
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
@@ -14076,6 +14242,6 @@
 "Warnung: Das Entfernen des veralteten Plugins \"{0}\" ist fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:733
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
 #, java-format
 msgid ""
@@ -14084,8 +14250,8 @@
 msgstr ""
 "Warnung: Die Installation des bereits heruntergeladenen Plugins \"{0}\" ist "
-"fehlgeschlagen. Installation wird übersprungen. JOSM wird die alste Plugin-"
+"fehlgeschlagen. Installation wird übersprungen. JOSM wird die alte Plugin-"
 "Version laden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:738
 #, java-format
 msgid ""
@@ -14093,13 +14259,13 @@
 "''{1}''. Renaming failed."
 msgstr ""
-"Warnung: Installation des Plugins ''{0}'' von temporär heruntergeladener "
-"Datei ''{1}'' fehlgeschlagen. Umbenennen fehlgeschlagen."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
+"Warnung: Die Installation des Plugins \"{0}\" aus der temporären Datei "
+"''{1}'' ist fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:750
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr "Plugin \"{0}\" deaktivieren"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:763
 #, java-format
 msgid ""
@@ -14109,10 +14275,10 @@
 "ausgelöst haben könnte."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:766
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:737
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:769
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14121,9 +14287,9 @@
 "Plugins, bevor Sie den Fehler melden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:771
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:843
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14133,16 +14299,18 @@
 "um das Plugin zu entfernen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:853
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:885
 msgid "Plugin information"
 msgstr "Plugin-Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:858
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:179
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Nicht wieder prüfen und beim Start anzeigen (speichert Auswahl)"
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:922
+msgid ""
+"Do not ask again and remember my decision (go to Preferences->Plugins to "
+"change it later)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
@@ -14395,5 +14563,5 @@
 msgstr ""
 "<html>Schließen des Änderungssatzes <strong>{0}</strong> ist fehlgeschlagen,"
-"<br> weil der Änderungssatz bereits geschlossen wurde.</html>"
+"<br>weil der Änderungssatz bereits geschlossen wurde.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
@@ -14404,5 +14572,5 @@
 msgstr ""
 "<html>Schließen des Änderungssatzes <strong>{0}</strong> ist fehlgeschlagen,"
-"<br> weil der Änderungssatz bereits am {1} geschlossen wurde.</html>"
+"<br>weil der Änderungssatz bereits am {1} geschlossen wurde.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:183
@@ -14436,5 +14604,5 @@
 msgstr ""
 "<html>Der Sicherheitskontext erlaubt keine Verbindung zum Server<br>''{0}''."
-"<br>Wahrscheinlich haben Sie JOSM als applet gestartet, und dieses "
+"<br>Wahrscheinlich haben Sie JOSM als Applet gestartet, und dieses "
 "Applet<br>nicht von ''{1}'' geladen.</html>"
 
@@ -14470,5 +14638,5 @@
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage. <br>"
+msgstr "Der OSM-Server \"{0}\" meldet eine fehlerhafte Anfrage.<br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:310
@@ -14496,7 +14664,7 @@
 msgstr ""
 "Der OSM-Server ''{0}'' kennt ein Objekt, das Sie lesen, verändern oder "
-"löschen wollten nicht.<br> Es existiert entweder nicht auf dem Server oder "
-"Sie benutzen eine ungültige URL,<br> um auf den Server zuzugreifen. "
-"<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
+"löschen wollten, nicht.<br>Es existiert entweder nicht auf dem Server oder "
+"Sie benutzen eine ungültige URL,<br>um auf den Server zuzugreifen.<br>Bitte "
+"überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
@@ -14522,5 +14690,5 @@
 "<html>Der Server meldet, dass das Objekt gelöscht wurde.<br><strong>Das "
 "Hochladen ist fehlgeschlagen</strong>, falls versucht wurde das Objekt zu "
-"aktualisieren oder zu löschen.<br> <strong>Das Herunterladen ist "
+"aktualisieren oder zu löschen.<br><strong>Das Herunterladen ist "
 "fehlgeschlagen</strong>, falls versucht wurde, das Objekt herunterzuladen."
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
@@ -14535,7 +14703,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
-#, java-format
-msgid ""
-"Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
+#, fuzzy, java-format
+msgid ""
+"Warning: failed to access directory ''{0}'' for security reasons. Exception "
 "was: {1}"
 msgstr ""
@@ -14973,5 +15141,5 @@
 msgstr ""
 "Bereich \"{0}\" wurde im Zwischenspeicher gefunden.\n"
-"Soll dieser zuerstbenutzt werden?\n"
+"Soll dieser zuerst benutzt werden?\n"
 "(Nein = Zwischenspeicher wird geleert)"
 
@@ -15058,13 +15226,13 @@
 msgstr "Wähle eine Kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:155
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:157
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:166
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -15077,13 +15245,13 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:224
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:229
 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:289
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:291
 #, java-format
 msgid ""
@@ -15093,34 +15261,39 @@
 "Fehlermeldung ist: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Replace original background by JOSM background color."
 msgstr "Originale Hintergrundfarbe durch JOSM-Farbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Graue Farben invertieren (für schwarze Hintergründe)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Transparenten Hintergrund aktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
 msgid "Draw boundaries of downloaded data."
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:187
 msgid "Disable image cropping during georeferencing."
 msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+msgid ""
+"Automaticly select first WMS layer when grabing if multiple layers exist."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
 msgid "Enable automatic caching."
 msgstr "Automatischen Zwischenspeicher aktivieren."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "Max. cache size (in MB)"
 msgstr "Max. Speichergröße (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -15132,25 +15305,25 @@
 msgstr ""
 "Eine spezielle Schnittstelle für das französische Kataster-WMS auf www."
-"cadastre.gouv.fr<BR><BR>Bitte lesen Sie die Nutzungsbedingungen (auf "
+"cadastre.gouv.fr<br><br>Bitte lesen Sie die Nutzungsbedingungen (auf "
 "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."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "French cadastre WMS"
 msgstr "Französisches Kataster-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
 msgid "Source"
 msgstr "Quelle"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:218
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -15160,5 +15333,5 @@
 "Hintergrundfarbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -15168,9 +15341,9 @@
 "Nützlich für Texte auf dunklen Hintergründen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
 msgid "Allows multiple layers stacking"
 msgstr "Stapeln mehrerer Schichten erlauben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -15178,39 +15351,45 @@
 "durchsichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128
 msgid "Vector images grab multiplier:"
 msgstr "Multiplikator für Vektordaten:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
 msgid "Fixed size square (default is 100m)"
 msgstr "Feste Quadratgröße (Standard ist 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:171
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Feste Größe (von 25 bis 1000 Meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
 msgid "Raster images grab multiplier:"
 msgstr "Multiplikator für Pixelgrafiken:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:190
 msgid "Display crosspieces:"
 msgstr "Anzeige der Querstücke:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:224
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
-"Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
+"Alte Dateien werden automatisch gelöscht, wenn diese Größe überschritten wird"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:230
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -15491,5 +15670,5 @@
 msgstr "Lade WMS-Ebene aus Datei {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
 msgid ""
 "More than one WMS layer present\n"
@@ -15505,28 +15684,28 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214
 #, 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:214
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:216
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:219
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:218
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:220
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:423
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:425
 #, java-format
 msgid ""
@@ -15538,9 +15717,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:426
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:446
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -15549,5 +15728,5 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:450
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
@@ -15653,5 +15832,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
-msgstr "Ebene zum Änderung von GPS-Spuren"
+msgstr "Ebene zum Ändern von GPS-Spuren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
@@ -15911,4 +16090,34 @@
 msgstr "Einen Satz Bilder als neue Ebene laden."
 
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
+msgid "Josminator - Just do it!"
+msgstr ""
+
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
+msgid "Do some stuff"
+msgstr ""
+
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
+msgid "Dsdfasdfsdfotos"
+msgstr ""
+
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
+msgid "Exec"
+msgstr ""
+
+#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
+#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
+#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
+msgid "Execute Script"
+msgstr ""
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
@@ -15943,4 +16152,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75
 msgid "Tracing"
 msgstr "Abzeichnen"
@@ -15970,4 +16180,5 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14
 msgid "An unknown error has occurred"
 msgstr "Ein unbekannter Fehler ist aufgetreten"
@@ -16166,5 +16377,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Größe der Landsat-Kacheln, gemessen in Pixeln. Standard ist 2.000."
+msgstr "Größe der Landsat-Kacheln, gemessen in Pixel. Standard ist 2.000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -16621,75 +16832,101 @@
 msgstr "Firefox-Programm"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+msgid "Read error!"
+msgstr "Lesefehler!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+msgid "Write error!"
+msgstr "Schreibfehler!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+"Positionsinformationen in den EXIF-Daten der folgenden Dateien speichern:"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
 #, fuzzy
-msgid "Read error!"
-msgstr "Speicherbecken"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
-msgid "Write error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+msgid "settings"
+msgstr "Einstellungen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+msgid "keep backup files"
+msgstr "Behalte Sicherungsdateien"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 #, fuzzy
-msgid "Write coordinates to image header"
-msgstr "Koordinaten des neuen Knotens eingeben."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
-msgid "Write position information into the exif header of the following files:"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+msgid "change file modification time:"
+msgstr "Ort ändern"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+msgid "to gps time"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+msgid "to previous value (unchanged mtime)"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+msgid "Photo Geotagging Plugin"
+msgstr "Foto Geotagging Plugin"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+msgid "Writing position information to image files..."
+msgstr "Positionsinformationen werden in Bilddateien gespeichert..."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
 #, fuzzy
-msgid "keep backup files"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
-msgid "Photo Geotagging Plugin"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
-msgid "Writing position information to image files..."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+msgid "Could not read mtime."
+msgstr "Datei konnte nicht umbenannt werden!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
 #, fuzzy
-msgid "Error: "
-msgstr "Fehler"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
-#, fuzzy
+msgid "Could not write mtime."
+msgstr "Dateien konnten nicht importiert werden."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
 msgid "File could not be deleted!"
-msgstr "Bilddatei konnte nicht gelöscht werden."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
-#, fuzzy
+msgstr "Datei konnte nicht gelöscht werden!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
 msgid "Could not rename file!"
-msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgstr "Datei konnte nicht umbenannt werden!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
-#, fuzzy
+msgstr "<html><h3>Es gibt alte Sicherungsdateien im Bilderverzeichnis!</h3>"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
 msgid "Override old backup files?"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
-#, fuzzy
+msgstr "Alte Sicherungsdateien überschreiben?"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
 msgid "Keep old backups and continue"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
-#, fuzzy
+msgstr "Alte Sicherungsdateien behalten und fortfahren"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
 msgid "Override"
 msgstr "Überschreiben"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+msgid "Could not delete temporary file!"
+msgstr "Kann temporäre Datei nicht löschen!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
 #, fuzzy
-msgid "Could not delete temporary file!"
-msgstr "Dateien konnten nicht importiert werden."
+msgid "Test failed: Could not read mtime."
+msgstr "Bilddatei konnte nicht gelöscht werden."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#, fuzzy
+msgid "Test failed: Could not write mtime."
+msgstr "Bilddatei konnte nicht gelöscht werden."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
+msgid "Write coordinates to image header"
+msgstr "Koodinaten in Bild speichern"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -17094,15 +17331,13 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
 msgid "Enter housenumbers or amount of segments"
-msgstr ""
+msgstr "Hausnummern oder Anzahl derAbschnitte eingeben"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
-#, fuzzy
 msgid "Terrace a house"
-msgstr "Gebäude abteilen"
+msgstr "Ein Haus aufteilen"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
-#, fuzzy
 msgid "Interpolation"
-msgstr "Adressinterpolation"
+msgstr "Interpolation"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
@@ -17112,41 +17347,34 @@
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
-#, fuzzy
 msgid "Street"
-msgstr "Straßen"
+msgstr "Straße"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
-#, fuzzy
 msgid "Highest Number"
 msgstr "Höchste Nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
-#, fuzzy
 msgid "Lowest Number"
 msgstr "Niedrigste Nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
-#, fuzzy
 msgid "Lowest housenumber of the terraced house"
-msgstr "Niedrigste Hausnummer kann nicht größer als höchste Nummer sein"
+msgstr "Kleinste Hausnummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
 msgid "add to existing associatedStreet relation"
-msgstr ""
+msgstr "Zu Straßenzugehörigkeitsrelation hinzufügen"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
-#, fuzzy
 msgid "create an associatedStreet relation"
-msgstr "Eine neue Relation erstellen"
+msgstr "Eine Straßenzugehörigkeitsrelation erzeugen"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
-#, fuzzy
 msgid "delete outline way"
-msgstr "Überlappende Wege löschen"
+msgstr "Ursprungsweg löschen"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
-#, fuzzy
 msgid "Street name: "
-msgstr "Straßenname"
+msgstr "Straßenname: "
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
@@ -17197,7 +17425,6 @@
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
-#, fuzzy
 msgid "Cannot reverse!"
-msgstr "nicht vorhanden"
+msgstr "Umkehren nicht möglich!"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
@@ -17221,4 +17448,24 @@
 msgid "Terrace"
 msgstr "Abteilen"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
+#, fuzzy
+msgid "Merge objects nodes"
+msgstr "{0} Knoten vereinigen"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+#, fuzzy
+msgid "Tracer"
+msgstr "Abteilen"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+#, fuzzy
+msgid "Tracer."
+msgstr "Abteilen"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
+#, fuzzy
+msgid "Tracer building"
+msgstr "Gebäude abteilen"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
@@ -18603,11 +18850,17 @@
 "oder 'desc' eines Wegpunktes mit dem Dateinamen des Bildes übereinstimmt."
 
+#. Plugin JOSM_Script
+#: build/trans_plugins.java:29 build/trans_plugins.java:31
+#, fuzzy
+msgid "nice Plugin"
+msgstr "Erweiterungen"
+
 #. Plugin lakewalker
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:33
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
 #. Plugin livegps
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:35
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -18617,5 +18870,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:37
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -18628,10 +18881,10 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:39
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:41
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -18642,5 +18895,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:43
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -18653,15 +18906,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:45
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:47
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:49
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -18671,5 +18924,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:51
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -18678,12 +18931,14 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:53
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
 "right click menu of the image layer."
 msgstr ""
+"Schreibe GPS-Position in die Dateiinformationen von Fotos. Rufen Sie diese "
+"Funktion per Rechtsklick auf die Foto-Ebene auf."
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:55
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18694,15 +18949,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:57
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:59
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden."
 
 #. Plugin routes
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:61
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18713,10 +18968,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:63
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:65
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -18727,15 +18982,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:67
 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:65
+#: build/trans_plugins.java:69
 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:67
+#: build/trans_plugins.java:71
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18748,10 +19003,17 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
+#. Plugin Tracer
+#: build/trans_plugins.java:75
+msgid ""
+"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
+"to be runnign."
+msgstr ""
+
 #. Plugin validator
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:77
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18763,5 +19025,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:79
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18773,10 +19035,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:81
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:83
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31279,4 +31541,27 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "Node {0} cannot be added to the way because it was deleted"
+#~ msgstr ""
+#~ "Knoten {0} kann nicht zum Weg hinzugefügt werden, weil er gelöscht wurde"
+
+#~ msgid ""
+#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
+#~ "and internal id {2}"
+#~ msgstr ""
+#~ "Warnung: ignoriere changeset id {0} für neues Object mit externer id {1} "
+#~ "und interner id {2}"
+
+#~ msgid ""
+#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
+#~ msgstr ""
+#~ "Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
+#~ "externer ID ''{1}''"
+
+#~ msgid "Do not check and ask again at startup (remembers choice)"
+#~ msgstr "Nicht wieder prüfen und beim Start anzeigen (speichert Auswahl)"
+
+#~ msgid "Error: "
+#~ msgstr "Fehler: "
+
 #~ msgid "image"
 #~ msgid_plural "images"