Index: utils/josm/plugins/lang/de/de.po
===================================================================
--- utils/josm/plugins/lang-de/de.po	(revision 1476)
+++ utils/josm/plugins/lang/de/de.po	(revision 1496)
@@ -7,5 +7,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 23:04+0200\n"
+"POT-Creation-Date: 2006-10-22 20:57+0200\n"
 "PO-Revision-Date: 2006-10-14 20:38+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -17,4 +17,422 @@
 "X-Generator: KBabel 1.9.1\n"
 
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "About"
+msgstr "Über"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "Display the about screen."
+msgstr "Über dieses Programm"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#, java-format
+msgid "last change at {0}"
+msgstr "Letzte Änderung am {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java  Version {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+msgid "Homepage"
+msgstr "Webseite"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
+msgid "Bug Reports"
+msgstr "Fehler melden:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
+msgid "News about JOSM"
+msgstr "Neues über JOSM..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "Readme"
+msgstr "Bitte lesen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
+msgid "Revision"
+msgstr "Version"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
+msgid "Contribution"
+msgstr "Mitwirkung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
+msgid "About JOSM..."
+msgstr "Über JOSM..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
+msgid "File could not be found."
+msgstr "Datei wurde nicht gefunden."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr "Knotenpunkte im Kreis anordnen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+msgid "Move the selected nodes into a circle."
+msgstr "Gewählte Punkte auf eine Kreisform bringen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+msgid "Please select at least four nodes."
+msgstr "Bitte wählen Sie mindestens vier Punkte aus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr "Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+msgid "selection"
+msgstr "Auswahl"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+msgid "layer"
+msgstr "Ebene"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
+msgid "conflict"
+msgstr "Konflikt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr "Automatisch skalieren: {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
+#, java-format
+msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+msgstr ""
+"Den Bereich automatisch zoomen (nach {0}. Ausgeschaltet wenn der Bereich "
+"bewegt wird)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
+msgid "No document open so nothing to save."
+msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+msgid "The document contains no data. Save anyway?"
+msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+msgid "Empty document"
+msgstr "Leeres Dokument"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. "
+"Sollen alle Konflikte abgewiesen werden?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+msgid "Conflicts"
+msgstr "Konflikte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+msgid "File exists. Overwrite?"
+msgstr "Datei existiert. Überschreiben?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
+msgid "Download from OSM"
+msgstr "Von OSM laden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
+msgid "Download map data from the OSM server."
+msgstr "Kartendaten vom OSM Server laden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
+msgid ""
+"Move and zoom the image like the main map. Select an area to download by "
+"dragging."
+msgstr ""
+"Sie können verschieben und Zoomen wie auf der Hauptkarte. Wählen Sie den zu "
+"ladenden Bereich durch einfügen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
+msgid "Bounding box"
+msgstr "Zeichen-Box"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
+msgid "min lat"
+msgstr "min Breite"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
+msgid "min lon"
+msgstr "min Länge"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
+msgid "max lat"
+msgstr "max Breite"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
+msgid "max lon"
+msgstr "max Länge"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
+msgid "Download the following data:"
+msgstr "Lade die folgenden Daten aus dem Internet:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
+msgid "URL from www.openstreetmap.org"
+msgstr "URL von www.openstreetmap.org"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
+msgid "Please enter the desired coordinates first."
+msgstr "Bitte wählen Sie zuerst die Koordinaten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
+msgid "Please enter a name for the location."
+msgstr "Bitte geben Sie einen Namen für den Ort an."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
+msgid "Select a bookmark first."
+msgstr "Bitte wählen Sie ein Lesezeichen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
+msgid "Choose an area"
+msgstr "Bereich auswählen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
+msgid "Please enter the desired coordinates or click on a bookmark."
+msgstr ""
+"Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
+msgid "Please select at least one download data type."
+msgstr "Bitte wählen Sie mindestens einen Quelle zum laden aus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
+#, java-format
+msgid "Downloading {0} segment"
+msgid_plural "Downloading {0} segments"
+msgstr[0] "Hole {0} Abschnitt"
+msgstr[1] "Hole {0} Abschnitte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+msgid "Download incomplete objects"
+msgstr "Unvollständige Objekte nachladen?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr "Alle (ausgewählten) unvollständigen Wege vom OSM Server laden."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+msgid "Please select an incomplete way."
+msgstr "Bitte einen unvollständigen Weg auswählen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "{0} unvollständige Wege nachladen?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+msgid "Download?"
+msgstr "Daten laden?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
+msgid "Raw GPS data"
+msgstr "Roh GPS-Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr "Hole GPS-Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
+#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:21
+msgid "Downloading data"
+msgstr "Lade Daten aus dem Internet"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr "Keine Daten importiert."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
+msgid "Data Layer"
+msgstr "Daten-Ebene"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit"
+msgstr "Beenden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit the application."
+msgstr "Beende das Programm."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Dateien (.osm .xml)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "GPX Dateien (.gpx)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Dateien (.csv .txt)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
+#, java-format
+msgid "Executing {0}"
+msgstr "Erledige {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
+msgid "The Tool requires some data to be loaded."
+msgstr "Für das Werkzeug ist es nötig das Daten geladen sind."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
+#, java-format
+msgid "Could not execute command: {0}"
+msgstr "Kann \"{0}\" nicht ausführen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
+msgid "Tools"
+msgstr "Werkzeuge"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
+msgid "Could not read external tool configuration."
+msgstr "Kann die externen Werkzeugeinstellungen nicht lesen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+msgid ""
+"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
+"GPL  stehen hoch-spielen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "In GPX exportieren"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Die Daten ins GPX-Format exportieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "GPS Track-Beschreibung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Information zum Autor hinzufügen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Voller Name"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Vordefiniert"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Jahr des Copyrights"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Export-Einstellungen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Fehler beim exportieren von. {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+msgid "Error"
+msgstr "Fehler"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Wähle eine vordefinierte Lizenz"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:106
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "Kann nur Hilfeseite von JOSM Online Hilfe bearbeiten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add node"
+msgstr "Knotenpunkt hinzufügen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add a new node to the map"
+msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add node into segment"
+msgstr "Knotenpunkt in einen Abschnitt einfügen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+msgid "Add a node into an existing segment"
+msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
+msgid "Can not add a node outside of the world."
+msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
+msgid "Add Node into Segment"
+msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
+
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
 msgid "Add segment"
@@ -25,86 +443,4 @@
 msgstr "Abschnitt zwischen zwei Knotenpunkten hinzufügen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-msgid "Delete nodes, streets or segments."
-msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
-msgid "Cannot delete node."
-msgstr "Kann den Knotenpunkt nicht löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
-msgid "This object is in use."
-msgstr "Das Objekt wird benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
-msgid "Used by more than two segments."
-msgstr "Wird bei mehr als zwei Abschnitten benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
-msgid "Used by only one segment."
-msgstr "Wird bei einen Abschnitt benutzt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
-msgid "Wrong direction of segments."
-msgstr "Falsche Richtung der Abschnitte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
-msgid "Conflicting keys"
-msgstr "Schlüsselkonflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
-msgid "Segments are part of different ways."
-msgstr "Abschnitte gehören zu verschiedenen Wegen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
-msgid "Delete Node"
-msgstr "Knotenpunkt löschen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
-msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
-msgstr "Zoomen durch anklicken  (Strg-Hoch,Links,Runter,Rechts,+,-)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
-msgid "Selection"
-msgstr "Auswahl"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
-msgid "Select objects by dragging or clicking."
-msgstr "Wähle Objekte durch ziehen oder klicken."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
-msgid "Straight line"
-msgstr "Verbundene Linie"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
-msgid "Select objects in a straight line."
-msgstr "Wähle Objekte in einer Reihe."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "Move"
-msgstr "Verschieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
-msgid "Move around objects that are under the mouse or selected."
-msgstr "Objekte die sich unter der Maus befinden oder ausgewählt sind verschieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
-msgid "Cannot move objects outside of the world."
-msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
-
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
@@ -117,5 +453,6 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
-msgid "Warning: This way is incomplete. Try to download it, before adding segments."
+msgid ""
+"Warning: This way is incomplete. Try to download it, before adding segments."
 msgstr ""
 "Achtung: Dieser Weg ist nicht vollständig. Er sollte vom Server geladen "
@@ -145,5 +482,6 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Do you want to add all other selected segments to the one selected way?"
-msgstr "Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
+msgstr ""
+"Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
@@ -170,53 +508,146 @@
 msgstr "Neuen Weg erstellen"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add node"
-msgstr "Knotenpunkt hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
-msgid "Add a new node to the map"
-msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add node into segment"
-msgstr "Knotenpunkt in einen Abschnitt einfügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
-msgid "Add a node into an existing segment"
-msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
-msgid "Can not add a node outside of the world."
-msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
-msgid "Add Node into Segment"
-msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr "Roh GPS-Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Hole GPS-Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-#: ../landsat/src/landsat/DownloadLandsatTask.java:21
-msgid "Downloading data"
-msgstr "Lade Daten aus dem Internet"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Keine Daten importiert."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Daten-Ebene"
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+msgid "Delete nodes, streets or segments."
+msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+msgid "Cannot delete node."
+msgstr "Kann den Knotenpunkt nicht löschen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+msgid "This object is in use."
+msgstr "Das Objekt wird benutzt."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+msgid "Used by more than two segments."
+msgstr "Wird bei mehr als zwei Abschnitten benutzt."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+msgid "Used by only one segment."
+msgstr "Wird bei einen Abschnitt benutzt."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Falsche Richtung der Abschnitte."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Schlüsselkonflikt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+msgid "Segments are part of different ways."
+msgstr "Abschnitte gehören zu verschiedenen Wegen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+msgid "Delete Node"
+msgstr "Knotenpunkt löschen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
+msgid "Move"
+msgstr "Verschieben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+msgid "Move around objects that are under the mouse or selected."
+msgstr ""
+"Objekte die sich unter der Maus befinden oder ausgewählt sind verschieben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+msgid "Cannot move objects outside of the world."
+msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Selection"
+msgstr "Auswahl"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Select objects by dragging or clicking."
+msgstr "Wähle Objekte durch ziehen oder klicken."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+msgid "Straight line"
+msgstr "Verbundene Linie"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+msgid "Select objects in a straight line."
+msgstr "Wähle Objekte in einer Reihe."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+msgstr "Zoomen durch anklicken  (Strg-Hoch,Links,Runter,Rechts,+,-)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open"
+msgstr "Öffnen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open a file."
+msgstr "Datei öffnen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Dateiendung unbekannt: {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#: ../../plugins/waypoints/src/WaypointOpenAction.java:59
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#: ../../plugins/waypoints/src/WaypointOpenAction.java:63
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kann \"{0}\" nicht lesen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+msgid "Open a preferences page for global settings."
+msgstr "öffnete eine Globale Einstellungs-Seite."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Wiederherstellen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Wiederhole die letzte zurückgenommene Aktion."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+msgid "Rename layer"
+msgstr "Ebene umbenennen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Auch die Datei umbenennen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Kann die Datei \"{0}\" nicht umbenennen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
@@ -233,90 +664,31 @@
 msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-msgid "Open a preferences page for global settings."
-msgstr "öffnete eine Globale Einstellungs-Seite."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open"
-msgstr "Öffnen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
-msgid "Open a file."
-msgstr "Datei öffnen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
-msgid "CSV Data import for non-GPS data is not implemented yet."
-msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
-#, java-format
-msgid "Unknown file extension: {0}"
-msgstr "Dateiendung unbekannt: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Fehler beim Parsen. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Kann \"{0}\" nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr "Erledige {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr "Für das Werkzeug ist es nötig das Daten geladen sind."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr "Kann \"{0}\" nicht ausführen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr "Werkzeuge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-msgstr "Kann die externen Werkzeugeinstellungen nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
-msgid "Align Nodes in Circle"
-msgstr "Knotenpunkte im Kreis anordnen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-msgid "Move the selected nodes into a circle."
-msgstr "Gewählte Punkte auf eine Kreisform bringen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-msgid "Please select at least four nodes."
-msgstr "Bitte wählen Sie mindestens vier Punkte aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr "Ebene umbenennen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Auch die Datei umbenennen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Kann die Datei \"{0}\" nicht umbenennen."
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
+msgid "Save the current data."
+msgstr "Speichere die aktuellen Daten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
+msgid "CSV output not supported yet."
+msgstr "CSV Ausgabe ist noch nicht möglich."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
+msgid "Unknown file extension."
+msgstr "Dateiendung unbekannt."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
+msgid "An error occoured while saving."
+msgstr "Beim Speichern ist ein Fehler aufgetreten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save as"
+msgstr "Speichern als"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save the current data to a new file."
+msgstr "Speichere die aktuellen Daten als neue Datei."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
@@ -328,236 +700,4 @@
 msgstr "Letzte Aktion zurücknehmen."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download from OSM"
-msgstr "Von OSM laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
-msgid "Download map data from the OSM server."
-msgstr "Kartendaten vom OSM Server laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
-msgid ""
-"Move and zoom the image like the main map. Select an area to download by "
-"dragging."
-msgstr ""
-"Sie können verschieben und Zoomen wie auf der Hauptkarte. Wählen Sie den zu "
-"ladenden Bereich durch einfügen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
-msgid "Bounding box"
-msgstr "Zeichen-Box"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
-msgid "min lat"
-msgstr "min Breite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
-msgid "min lon"
-msgstr "min Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
-msgid "max lat"
-msgstr "max Breite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
-msgid "max lon"
-msgstr "max Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
-msgid "Download the following data:"
-msgstr "Lade die folgenden Daten aus dem Internet:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
-msgid "URL from www.openstreetmap.org"
-msgstr "URL von www.openstreetmap.org"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
-msgid "Bookmarks"
-msgstr "Lesezeichen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
-msgid "Please enter the desired coordinates first."
-msgstr "Bitte wählen Sie zuerst die Koordinaten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
-msgid "Please enter a name for the location."
-msgstr "Bitte geben Sie einen Namen für den Ort an."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
-msgid "Select a bookmark first."
-msgstr "Bitte wählen Sie ein Lesezeichen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
-msgid "Choose an area"
-msgstr "Bereich auswählen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
-msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr "Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
-msgid "Please select at least one download data type."
-msgstr "Bitte wählen Sie mindestens einen Quelle zum laden aus."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit"
-msgstr "Beenden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
-msgid "Exit the application."
-msgstr "Beende das Programm."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "About"
-msgstr "Über"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
-msgid "Display the about screen."
-msgstr "Über dieses Programm"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
-#, java-format
-msgid "Java OpenStreetMap Editor Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
-#, java-format
-msgid "last change at {0}"
-msgstr "Letzte Änderung am {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, java-format
-msgid "Java Version {0}"
-msgstr "Java  Version {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
-msgid "Homepage"
-msgstr "Webseite"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
-msgid "Bug Reports"
-msgstr "Fehler melden:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
-msgid "News about JOSM"
-msgstr "Neues über JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
-msgid "Info"
-msgstr "Info"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-msgid "Readme"
-msgstr "Bitte lesen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
-msgid "Revision"
-msgstr "Version"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-msgid "Contribution"
-msgstr "Mitwirkung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
-msgid "About JOSM..."
-msgstr "Über JOSM..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
-msgid "File could not be found."
-msgstr "Datei wurde nicht gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
-msgid "No document open so nothing to save."
-msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "The document contains no data. Save anyway?"
-msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
-msgid "Empty document"
-msgstr "Leeres Dokument"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Es gibt ungelöste Konflikte. Konflikte können nicht gespeichert werden. "
-"Sollen alle Konflikte abgewiesen werden?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
-msgid "Conflicts"
-msgstr "Konflikte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "File exists. Overwrite?"
-msgstr "Datei existiert. Überschreiben?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
-msgid "Overwrite"
-msgstr "Überschreiben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-msgid "data"
-msgstr "Daten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-msgid "selection"
-msgstr "Auswahl"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
-msgid "layer"
-msgstr "Ebene"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
-msgid "conflict"
-msgstr "Konflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
-#, java-format
-msgid "Auto Scale: {0}"
-msgstr "Automatisch skalieren: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
-#, java-format
-msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
-msgstr ""
-"Den Bereich automatisch zoomen (nach {0}. Ausgeschaltet wenn der Bereich "
-"bewegt wird)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Speichern als"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Speichere die aktuellen Daten als neue Datei."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "OSM Server Dateien (.osm .xml)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "GPX Dateien (.gpx)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "CSV Dateien (.csv .txt)"
-
 #: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
@@ -600,210 +740,426 @@
 msgstr "Diese Änderungen vornehmen?"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:52
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "Kann nur Hilfeseite von JOSM Online Hilfe bearbeiten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
-#, java-format
-msgid "Downloading {0} segment"
-msgid_plural "Downloading {0} segments"
-msgstr[0] "Hole {0} Abschnitt"
-msgstr[1] "Hole {0} Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
-msgid "Download incomplete objects"
-msgstr "Unvollständige Objekte nachladen?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
-msgid "Download all (selected) incomplete ways from the OSM server."
-msgstr "Alle (ausgewählten) unvollständigen Wege vom OSM Server laden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
-msgid "Please select an incomplete way."
-msgstr "Bitte einen unvollständigen Weg auswählen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr "{0} unvollständige Wege nachladen?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
-msgid "Download?"
-msgstr "Daten laden?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Wiederherstellen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Wiederhole die letzte zurückgenommene Aktion."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
-"GPL  stehen hoch-spielen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "In GPX exportieren"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Die Daten ins GPX-Format exportieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "GPS Track-Beschreibung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Information zum Autor hinzufügen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Voller Name"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "E-Mail"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Vordefiniert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Jahr des Copyrights"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Schlüsselwörter"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Export-Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Fehler beim exportieren von. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Fehler"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Wähle eine vordefinierte Lizenz"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr "Speichern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr "Speichere die aktuellen Daten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr "CSV Ausgabe ist noch nicht möglich."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr "Dateiendung unbekannt."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr "Beim Speichern ist ein Fehler aufgetreten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
-#, java-format
-msgid ""
-"The plugin {0} throwed an exception: {1}\n"
-"It may be outdated. Please contact the plugin's autor.\n"
-"This message will not shown again until JOSM is restarted."
-msgstr ""
-"Das Plugin {0} ist auf die Ausnahmebedingung (Exception) gestoßen: {1}\n"
-"Vielleicht ist es veraltet? Bitte nehmen Sie Kontakt mit dem Plugin Autor auf.\n"
-"Diese Meldung erscheint erst wieder mit dem nächsten Neustart des Programmes."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Do nothing"
-msgstr "Nichts tun"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Report Bug"
-msgstr "Fehler melden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
-msgid ""
-"An unexpected exception occoured.\n"
-"\n"
-"This is always a coding error. If you are running the latest\n"
-"version of JOSM, please consider be kind and file a bug report."
-msgstr ""
-"Ein unvorhergesehener Fehler trat auf.\n"
-"\n"
-"Dies ist immer ein Programmierfehler. Wenn Sie die neueste\n"
-"Version von JOSM einsetzen, seine Sie bitte so gut und melden \n"
-"uns den Fehler als \"Bug Report\"."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
-msgid "Unexpected Exception"
-msgstr "Unerwarteter Fehler"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-msgid ""
-"Please send this to josm@eigenheimstrasse.de\n"
-"\n"
-msgstr ""
-"Bitte senden Sie diesen an josm@eigenheimstrasse.de\n"
-"\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
-msgid ""
-"Please send an email with the following information to josm@eigenheimstrasse."
-"de"
-msgstr ""
-"Bitte schicken Sie eine E-Mail mit den folgenden Text an "
-"josm@eigenheimstrasse.de"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
-msgid "Ctrl-"
-msgstr "Strg-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
-msgid "Alt-"
-msgstr "Alt-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
-msgid "AltGr-"
-msgstr "AltGr-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
-msgid "Shift-"
-msgstr "Shift-"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "Ein Fehler ist im Plugin {0} aufgetreten."
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Ändere"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Entferne \"{0}\" für"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Setze {0}={1} für"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "Objekt"
+msgstr[1] "Objekte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Löse {0} Konflikte in {1} Objekten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "Knotenpunkt"
+msgstr[1] "Knotenpunkte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr "Abfolge"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "verschieden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "gelöscht"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "wahr"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "falsch"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "von"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "Position"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "nichts"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "Abschnitte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "bis"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr "neu"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "Abschnitt"
+msgstr[1] "Abschnitte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} Knotenpunkt"
+msgstr[1] "{0} Knotenpunkte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr "unvollständig"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "Weg"
+msgstr[1] "Wege"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+msgid "background"
+msgstr "Hintergrund"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+msgid "incomplete way"
+msgstr "unvollständiger Weg"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "selected"
+msgstr "gewählt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
+msgid "gps point"
+msgstr "GPS Punkt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
+msgid "scale"
+msgstr "Skala"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unbekannter Typ in Zeile {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
+#, java-format
+msgid ""
+"display_values ({0}) and values ({1}) must be of same number of elements."
+msgstr ""
+"display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
+"haben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "Element"
+msgstr[1] "Elemente"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Einstellungen ändern"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
+msgid "Could not read bookmarks."
+msgstr "Kann Lesezeichen nicht lesen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
+msgid "Could not write bookmark."
+msgstr "Kann Lesezeichen nicht schreiben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+msgid "Key"
+msgstr "Schlüssel"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+msgid "Value"
+msgstr "Wert"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#, java-format
+msgid "{0} object has conflicts:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} Objekt hat Konflikte:"
+msgstr[1] "{0} Objekte haben Konflikte:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+msgid "my version:"
+msgstr "meine Version:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+msgid "their version:"
+msgstr "deren Version:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+msgid "resolved version:"
+msgstr "neue Version:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Befehlsliste"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr "Konflikte lösen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Lösen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Öffnet eine Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid "Select"
+msgstr "Wähle aus"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Setze die gewählten Elemente auf der Karte auf die obige Liste der "
+"ausgewählten Objekte."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
+msgid "Please select something from the conflict list."
+msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+msgid "Resolve Conflicts"
+msgstr "Konflikte entfernen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
+msgid "Click Reload to refresh list"
+msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr "Neu Laden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Revert"
+msgstr "Zücknehmen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr "Geschichte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+msgid "Object"
+msgstr "Objekt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
+msgid "Not implemented yet."
+msgstr "Noch nicht fertig."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
+"zurückführen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
+msgid "Delete the selected layer."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+msgid "Show/Hide"
+msgstr "Zeigen/Verstecken"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+msgid "Toggle visible state of the selected layer."
+msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Layers"
+msgstr "Ebenen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Open a list of all loaded layers."
+msgstr "Öffnet eine Liste alle geladenen Ebenen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+msgid "Move the selected layer one row up."
+msgstr "Gewählte Ebene eine Reihe höher schieben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+msgid "Move the selected layer one row down."
+msgstr "Gewählte Ebene eine Reihe tiefer schieben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Bitte wählen Sie die Objekte an denen die Eigenschaften geändert werden "
+"sollen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Dies wird ein {0} Objekt ändern"
+msgstr[1] "Dies wird {0} Objekte ändern."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+msgstr ""
+"Bitte geben Sie einen neuen Wert für \"{0}\" an.<br>(Leereingabe löscht den "
+"Eintrag.)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+msgid "Change values?"
+msgstr "Wert ändern?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
+msgid "<different>"
+msgstr "<verschieden>"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+msgid "Please select objects for which you want to change properties."
+msgstr ""
+"Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+msgid "Please select a key"
+msgstr "Bitte wählen Sie einen Schlüssel"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
+msgid "Please select a value"
+msgstr "Bitte wählen Sie einen Wert"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+msgid "Properties"
+msgstr "Einstellungen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+msgid "Property for selected objects."
+msgstr "Einstellungen der Ausgewählten Objekte."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
+#, java-format
+msgid "Could not read annotation preset source: {0}"
+msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Fehler beim Parsen. {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ändere {0} Objekt"
+msgstr[1] "Ändere {0} Objekte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+msgid "Please select the row to edit."
+msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+msgid "Please select the row to delete."
+msgstr "Bitte wählen Sie die löschende Zeile."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+msgid "Add a new key/value pair to all objects"
+msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: ../../plugins/grid/src/grid/GridPlugin.java:43
+#: ../../plugins/grid/src/grid/GridPlugin.java:49
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+msgid "Edit the value of the selected key for all objects"
+msgstr "Den Wert des Schlüssels für alle Objekte ändern"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+msgid "Delete the selected key in all objects"
+msgstr "Den Schlüssel aus allen Objekten löschen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
@@ -874,288 +1230,105 @@
 msgstr "Suche"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Konflikte lösen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Lösen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Öffnet eine Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr "Wähle aus"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
-msgid "Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-"Setze die gewählten Elemente auf der Karte auf die obige Liste der "
-"ausgewählten Objekte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
-msgid "Please select something from the conflict list."
-msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-msgid "Resolve Conflicts"
-msgstr "Konflikte entfernen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Neu Laden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Zücknehmen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Geschichte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
-msgid "Object"
-msgstr "Objekt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Datum"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr "Noch nicht fertig."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
-"zurückführen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Command Stack"
-msgstr "Befehlsliste"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-msgid "Open a list of all commands (undo buffer)."
-msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Bitte wählen Sie die Objekte an denen die Eigenschaften geändert werden "
-"sollen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-#, java-format
-msgid "This will change {0} object."
-msgid_plural "This will change {0} objects."
-msgstr[0] "Dies wird ein {0} Objekt ändern"
-msgstr[1] "Dies wird {0} Objekte ändern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#, java-format
-msgid "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
-msgstr ""
-"Bitte geben Sie einen neuen Wert für \"{0}\" an.<br>(Leereingabe löscht den "
-"Eintrag.)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
-msgid "Change values?"
-msgstr "Wert ändern?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
-msgid "<different>"
-msgstr "<verschieden>"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-msgid "Please select objects for which you want to change properties."
-msgstr "Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "Please select a key"
-msgstr "Bitte wählen Sie einen Schlüssel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-msgid "Please select a value"
-msgstr "Bitte wählen Sie einen Wert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Properties"
-msgstr "Einstellungen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
-msgid "Property for selected objects."
-msgstr "Einstellungen der Ausgewählten Objekte."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#, java-format
-msgid "Could not read annotation preset source: {0}"
-msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
-#, java-format
-msgid "Error parsing {0}: "
-msgstr "Fehler beim Parsen. {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
-#, java-format
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ändere {0} Objekt"
-msgstr[1] "Ändere {0} Objekte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Key"
-msgstr "Schlüssel"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
-msgid "Value"
-msgstr "Wert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
-msgid "Please select the row to edit."
-msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
-msgid "Please select the row to delete."
-msgstr "Bitte wählen Sie die löschende Zeile."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-msgid "Add a new key/value pair to all objects"
-msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-msgid "Edit the value of the selected key for all objects"
-msgstr "Den Wert des Schlüssels für alle Objekte ändern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-msgid "Delete the selected key in all objects"
-msgstr "Den Schlüssel aus allen Objekten löschen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
-msgid "Delete the selected layer."
-msgstr "Ausgewählte Ebene löschen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
-msgid "Show/Hide"
-msgstr "Zeigen/Verstecken"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
-msgid "Toggle visible state of the selected layer."
-msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Layers"
-msgstr "Ebenen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
-msgid "Open a list of all loaded layers."
-msgstr "Öffnet eine Liste alle geladenen Ebenen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
-msgid "Move the selected layer one row up."
-msgstr "Gewählte Ebene eine Reihe höher schieben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
-msgid "Move the selected layer one row down."
-msgstr "Gewählte Ebene eine Reihe tiefer schieben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unbekannter Typ in Zeile {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
-#, java-format
-msgid "display_values ({0}) and values ({1}) must be of same number of elements."
-msgstr ""
-"display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
-"haben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "Element"
-msgstr[1] "Elemente"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "Knotenpunkt"
-msgstr[1] "Knotenpunkte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:136
-msgid "segment"
-msgid_plural "segments"
-msgstr[0] "Abschnitt"
-msgstr[1] "Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:137
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "Weg"
-msgstr[1] "Wege"
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder für {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+msgid "Read GPS..."
+msgstr "Lese GPS..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Kein Zeit für Punkt {0} x {1}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+msgid "No images with readable timestamps found."
+msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lese {0} ...."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+msgid "Geotagged Images"
+msgstr "Bilder mit Ortsbezug"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Start: {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Ende: {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Momentaner Unterschied {0}s"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+msgid "timezone difference: "
+msgstr "Zeitzonen Unterschied: "
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+msgid "image"
+msgid_plural "images"
+msgstr[0] "Bild"
+msgstr[1] "Bilder"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innerhalb des Tracks."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+msgid "Sync clock"
+msgstr "Uhrzeit Synchronisieren"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG Bilder (*.jpg)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Die Datei {0} kann nicht verarbeitet werden."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+msgid "Image"
+msgstr "Bild"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+msgid "GPS unit timezome (difference to photo)"
+msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+msgid "Syncronize Time with GPS Unit"
+msgstr "Zeit mit GPS Gerät synchronisieren"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+msgid "Time entered could not be parsed."
+msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
@@ -1255,251 +1428,4 @@
 msgstr "Bilder importieren"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG Bilder (*.jpg)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder für {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
-msgid "Read GPS..."
-msgstr "Lese GPS..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Kein Zeit für Punkt {0} x {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
-msgid "No images with readable timestamps found."
-msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lese {0} ...."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
-msgid "Geotagged Images"
-msgstr "Bilder mit Ortsbezug"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Start: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Ende: {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Momentaner Unterschied {0}s"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
-msgid "timezone difference: "
-msgstr "Zeitzonen Unterschied: "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-msgid "image"
-msgid_plural "images"
-msgstr[0] "Bild"
-msgstr[1] "Bilder"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innerhalb des Tracks."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-msgid "Sync clock"
-msgstr "Uhrzeit Synchronisieren"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Die Datei {0} kann nicht verarbeitet werden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-msgid "Image"
-msgstr "Bild"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
-msgid "GPS unit timezome (difference to photo)"
-msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-msgid "Syncronize Time with GPS Unit"
-msgstr "Zeit mit GPS Gerät synchronisieren"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
-msgid "Time entered could not be parsed."
-msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
-msgid "Could not read bookmarks."
-msgstr "Kann Lesezeichen nicht lesen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
-msgid "Could not write bookmark."
-msgstr "Kann Lesezeichen nicht schreiben."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
-msgid "Java Open Street Map - Editor"
-msgstr "Java OpenStreetMap - Editor "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
-msgid "layer not in list."
-msgstr "Ebene nicht in der Liste."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
-msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
-msgid "There are unsaved changes. Really quit?"
-msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
-msgid "Unsaved Changes"
-msgstr "Daten nicht gespeichert"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap - Editor "
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "usage"
-msgstr "Benutzung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "options"
-msgstr "Optionen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-msgid "Show this help"
-msgstr "Zeige diese Hilfe"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-msgid "Standard unix geometry argument"
-msgstr "Standard Unix Geometrie Argument"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-msgid "Download the bounding box"
-msgstr "Lade den Zeichen-Kasten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
-msgid "Open file (as raw gps, if .gpx or .csv)"
-msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
-msgid "Download the bounding box as raw gps"
-msgstr "Lade den Zeichen-Kasten als Roh-GPS"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-msgid "Select with the given search"
-msgstr "Auswählen mit der angegebenen Suche"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-msgid "Don't launch in fullscreen mode"
-msgstr "Nicht im Vollbildmodus starten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-msgid "Reset the preferences to default"
-msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
-msgid "Set the language. Example: "
-msgstr "Die Sprache Einstellen. Beispiel:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
-msgid "examples"
-msgstr "Beispiele"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Parameter werden in der Reihenfolge ausgewertet, wie sie angegeben werden. "
-"Stellen Sie also sicher, das Daten existieren, bevor der Parameter --"
-"selection verwendet wird."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr "Ebene"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr "Dateien"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr "Verbindung"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
-msgid "Contacting the OSM server..."
-msgstr "Versuche OSM Server zu erreichen...."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Lat/Lon"
-msgstr "Breite/Länge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
-#, java-format
-msgid "{0} object has conflicts:"
-msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} Objekt hat Konflikte:"
-msgstr[1] "{0} Objekte haben Konflikte:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
-msgid "my version:"
-msgstr "meine Version:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
-msgid "their version:"
-msgstr "deren Version:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
-msgid "resolved version:"
-msgstr "neue Version:"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
-msgid "Error while parsing"
-msgstr "Fehler beim Parsen"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
-msgid "File Not found"
-msgstr "Datei wurde nicht gefunden."
-
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
@@ -1556,5 +1482,6 @@
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+msgstr ""
+"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
@@ -1568,7 +1495,127 @@
 msgstr "Passwort"
 
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
+msgid "There are unsaved changes. Really quit?"
+msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
+msgid "Unsaved Changes"
+msgstr "Daten nicht gespeichert"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
+msgid "usage"
+msgstr "Benutzung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
+msgid "options"
+msgstr "Optionen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "Show this help"
+msgstr "Zeige diese Hilfe"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
+msgid "Standard unix geometry argument"
+msgstr "Standard Unix Geometrie Argument"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
+msgid "Download the bounding box"
+msgstr "Lade den Zeichen-Kasten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
+msgid "Download the bounding box as raw gps"
+msgstr "Lade den Zeichen-Kasten als Roh-GPS"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
+msgid "Select with the given search"
+msgstr "Auswählen mit der angegebenen Suche"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
+msgid "Don't launch in fullscreen mode"
+msgstr "Nicht im Vollbildmodus starten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Reset the preferences to default"
+msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
+msgid "Set the language. Example: "
+msgstr "Die Sprache Einstellen. Beispiel:"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
+msgid "examples"
+msgstr "Beispiele"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Parameter werden in der Reihenfolge ausgewertet, wie sie angegeben werden. "
+"Stellen Sie also sicher, das Daten existieren, bevor der Parameter --"
+"selection verwendet wird."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
+msgid "Java Open Street Map - Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
+msgid "Layer"
+msgstr "Ebene"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
+msgid "Files"
+msgstr "Dateien"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
+msgid "Connection"
+msgstr "Verbindung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Lat/Lon"
+msgstr "Breite/Länge"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
+msgid "layer not in list."
+msgstr "Ebene nicht in der Liste."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+msgid "Contacting the OSM server..."
+msgstr "Versuche OSM Server zu erreichen...."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+msgid "Error while parsing"
+msgstr "Fehler beim Parsen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+msgid "File Not found"
+msgstr "Datei wurde nicht gefunden."
+
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr "Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
+msgstr ""
+"Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
@@ -1589,5 +1636,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid "Force drawing of lines if the imported data contain no line information."
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -1637,5 +1685,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
-msgid "Login password to the OSM account. Leave blank to not store any password."
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM Server. Leer lassen, wenn kein Passwort gespeichert "
@@ -1699,5 +1748,6 @@
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr "Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
+msgstr ""
+"Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
@@ -1779,4 +1829,39 @@
 msgid "Downloading OSM data..."
 msgstr "Hole OSM-Daten...."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr "Daten-Fehler: Abschnit {0} ist gelöscht aber teil des Wegs {1}."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+"Daten-Fehler: Knotenpunkt {0} ist gelöscht, aber Teil des Abschnittes {1}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
+msgid "Incorrect password or username."
+msgstr "Passwort oder Benutzername falsch."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
+msgid "Save user and password (unencrypted)"
+msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+msgid "Enter Password"
+msgstr "Passwort eingeben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
+msgid "Aborting..."
+msgstr "Abbruch..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Fehler beim parsen."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
@@ -1828,14 +1913,4 @@
 msgstr "Rechner unbekannt."
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
-#, java-format
-msgid "Data error: lat value \"{0}\" is out of bound."
-msgstr "Daten Fehler: lat Wert \"{0}\" hat eine Grenze überschritten."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
-#, java-format
-msgid "Data error: lon value \"{0}\" is out of bound."
-msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
-
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
 msgid "Could not detect data format string."
@@ -1851,5 +1926,6 @@
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid "Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
 msgstr ""
 "Die Format -Zeile ist unvollständig. Brauche mindestens 'lat' und 'lon' "
@@ -1870,141 +1946,15 @@
 msgstr "Fehler beim parsen der Zeile {0}"
 
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
-msgid "Incorrect password or username."
-msgstr "Passwort oder Benutzername falsch."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
-msgid "Save user and password (unencrypted)"
-msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
-msgid "Enter Password"
-msgstr "Passwort eingeben"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
-msgid "Aborting..."
-msgstr "Abbruch..."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr "Daten-Fehler: Abschnit {0} ist gelöscht aber teil des Wegs {1}."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
-#, java-format
-msgid "Data error: Node {0} is deleted but part of Segment {1}"
-msgstr "Daten-Fehler: Knotenpunkt {0} ist gelöscht, aber Teil des Abschnittes {1}"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
-msgid "Error during parse."
-msgstr "Fehler beim parsen."
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
-msgid "position"
-msgstr "Position"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
-msgid "different"
-msgstr "verschieden"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
-msgid "deleted"
-msgstr "gelöscht"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "true"
-msgstr "wahr"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
-msgid "false"
-msgstr "falsch"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
-msgid "none"
-msgstr "nichts"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
-msgid "segments"
-msgstr "Abschnitte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
-msgid "to"
-msgstr "bis"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
-msgid "from"
-msgstr "von"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "new"
-msgstr "neu"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
-msgid "unknown"
-msgstr "unbekannt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} Knotenpunkt"
-msgstr[1] "{0} Knotenpunkte"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
-msgid "incomplete"
-msgstr "unvollständig"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-msgid "background"
-msgstr "Hintergrund"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
-msgid "incomplete way"
-msgstr "unvollständiger Weg"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
-msgid "selected"
-msgstr "gewählt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
-msgid "gps point"
-msgstr "GPS Punkt"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
-msgid "scale"
-msgstr "Skala"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#, java-format
-msgid "Resolve {0} conflicts in {1} objects"
-msgstr "Löse {0} Konflikte in {1} Objekten"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
-msgid "Change"
-msgstr "Ändere"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
-msgid "Sequence"
-msgstr "Abfolge"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Remove \"{0}\" for"
-msgstr "Entferne \"{0}\" für"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
-#, java-format
-msgid "Set {0}={1} for"
-msgstr "Setze {0}={1} für"
-
-#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "Objekt"
-msgstr[1] "Objekte"
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
+#: ../../plugins/waypoints/src/WaypointReader.java:55
+#, java-format
+msgid "Data error: lat value \"{0}\" is out of bound."
+msgstr "Daten Fehler: lat Wert \"{0}\" hat eine Grenze überschritten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
+#: ../../plugins/waypoints/src/WaypointReader.java:59
+#, java-format
+msgid "Data error: lon value \"{0}\" is out of bound."
+msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
 
 #: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
@@ -2038,38 +1988,127 @@
 msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
 
-#: ../osmarender/src/OsmarenderPlugin.java:102
-#: ../osmarender/src/OsmarenderPlugin.java:108
+#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "Ein Fehler ist im Plugin {0} aufgetreten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#, java-format
+msgid ""
+"The plugin {0} throwed an exception: {1}\n"
+"It may be outdated. Please contact the plugin's autor.\n"
+"This message will not shown again until JOSM is restarted."
+msgstr ""
+"Das Plugin {0} ist auf die Ausnahmebedingung (Exception) gestoßen: {1}\n"
+"Vielleicht ist es veraltet? Bitte nehmen Sie Kontakt mit dem Plugin Autor "
+"auf.\n"
+"Diese Meldung erscheint erst wieder mit dem nächsten Neustart des Programmes."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+msgid "Do nothing"
+msgstr "Nichts tun"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+msgid "Report Bug"
+msgstr "Fehler melden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+msgid ""
+"An unexpected exception occoured.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider be kind and file a bug report."
+msgstr ""
+"Ein unvorhergesehener Fehler trat auf.\n"
+"\n"
+"Dies ist immer ein Programmierfehler. Wenn Sie die neueste\n"
+"Version von JOSM einsetzen, seine Sie bitte so gut und melden \n"
+"uns den Fehler als \"Bug Report\"."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+msgid "Unexpected Exception"
+msgstr "Unerwarteter Fehler"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+msgid ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+msgstr ""
+"Bitte senden Sie diesen an josm@eigenheimstrasse.de\n"
+"\n"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Bitte schicken Sie eine E-Mail mit den folgenden Text an "
+"josm@eigenheimstrasse.de"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+msgid "Ctrl-"
+msgstr "Strg-"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Alt-"
+msgstr "Alt-"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "Shift-"
+msgstr "Shift-"
+
+#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid "Annotation Preset Tester"
+msgstr "Voreinstellungsquellen Tester"
+
+#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid ""
+"Open the annotation preset test tool for previewing annotation preset "
+"dialogs."
+msgstr ""
+"Statret den Voreinstellungsquellen Test Werkzeug um diese aus zu probieren."
+
+#: ../../plugins/annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
+"werden."
+
+#: ../../plugins/grid/src/grid/GridLayer.java:74
+#, fuzzy
+msgid "Grid layer:"
+msgstr "Ebene"
+
+#: ../../plugins/landsat/src/landsat/DownloadLandsatTask.java:18
+msgid "Landsat background images"
+msgstr "Landsat Hintergundbilder."
+
+#: ../../plugins/landsat/src/landsat/LandsatLayer.java:45
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
+"operieren."
+
+#: ../../plugins/landsat/src/landsat/LandsatLayer.java:70
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "WMS-Ebene: {0}"
+
+#: ../../plugins/osmarender/src/OsmarenderPlugin.java:102
+#: ../../plugins/osmarender/src/OsmarenderPlugin.java:108
 msgid "View"
 msgstr "Bild"
 
-#: ../landsat/src/landsat/DownloadLandsatTask.java:18
-msgid "Landsat background images"
-msgstr "Landsat Hintergundbilder."
-
-#: ../landsat/src/landsat/LandsatLayer.java:45
-msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
-msgstr ""
-"Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
-"operieren."
-
-#: ../landsat/src/landsat/LandsatLayer.java:70
-#, java-format
-msgid "WMS layer: {0}"
-msgstr "WMS-Ebene: {0}"
-
-#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid "Annotation Preset Tester"
-msgstr "Voreinstellungsquellen Tester"
-
-#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
-msgid ""
-"Open the annotation preset test tool for previewing annotation preset "
-"dialogs."
-msgstr "Statret den Voreinstellungsquellen Test Werkzeug um diese aus zu probieren."
-
-#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
-"werden."
-
+#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Datei öffnen."
+
+#: ../../plugins/waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Datei öffnen."
