Index: /applications/editors/josm/plugins/lang/de/de.po
===================================================================
--- /applications/editors/josm/plugins/lang/de/de.po	(revision 5923)
+++ /applications/editors/josm/plugins/lang/de/de.po	(revision 5924)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-03 19:45+0100\n"
-"PO-Revision-Date: 2007-12-04 20:39+0100\n"
+"POT-Creation-Date: 2007-12-07 09:06+0100\n"
+"PO-Revision-Date: 2007-12-07 09:21+0100\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -15,9 +15,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1"
+"Plural-Forms: nplurals=2; plural=n != 1;X-Generator: KBabel 1.11.4\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
 msgid "Load Selection"
 msgstr "Lade Auswahl"
@@ -25,4 +26,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
 #, java-format
 msgid "Contact {0}..."
@@ -31,4 +33,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
 msgid "Downloading..."
 msgstr "Lade Daten ..."
@@ -36,4 +39,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
 msgid "Could not read from url: \"{0}\""
@@ -42,4 +46,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
 msgid "Parsing error in url: \"{0}\""
@@ -48,4 +53,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 msgid "Search ..."
 msgstr "Suche ..."
@@ -53,4 +59,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 msgid "Search for objects."
 msgstr "Suche nach Objekten."
@@ -58,4 +65,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
 msgid "No data loaded."
 msgstr "Keine Daten geladen"
@@ -63,4 +71,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
 msgid "Please enter a search string."
 msgstr "Bitte einen Suchbegriff eingeben."
@@ -68,4 +77,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -85,4 +95,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
@@ -90,4 +101,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
@@ -95,4 +107,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
@@ -100,4 +113,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
 msgid "case sensitive"
 msgstr "Groß/Kleinschreibung unterscheiden"
@@ -105,4 +119,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 #: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "Search"
 msgstr "Suche"
@@ -130,4 +145,15 @@
 #: ../trunk/src/org/openstreetmap/josm/command/DeleteCommand.java:49
 #: ../trunk/src/org/openstreetmap/josm/command/DeleteCommand.java:61
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:59
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:241
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
+#: ../trunk.old/src/org/openstreetmap/josm/command/DeleteCommand.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/command/DeleteCommand.java:61
 msgid "Delete"
 msgstr "Löschen"
@@ -135,4 +161,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
 msgid "Delete nodes or ways."
 msgstr "Lösche Knotenpunkte oder Wege."
@@ -142,4 +169,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:208
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:229
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:208
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:229
 msgid "Cannot delete: Selection is used by relation"
 msgstr "Kann nicht löschen: Auswahl wird bei einer Relation benutzt."
@@ -147,9 +176,18 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:278
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:278
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:278
 msgid "Split way segment"
 msgstr "Weg aufspalten"
 
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:283
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:283
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: delete way+nodes. Ctrl: "
+"delete referring objects."
+msgstr "Anklicken: löschen Shift: Lösche Wegabschnitt. Alt: lösche Weg+Knotenpunkt. Strg: Lösche verweisende Objekte."
+
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 msgid "Zoom"
 msgstr "Zoom"
@@ -157,6 +195,12 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
-msgstr "Zommen durch ziehen  (Strg-Hoch,Links,Runter,Rechts,'.','-')"
+msgstr "Zoomen durch ziehen  (Strg-Hoch,Links,Runter,Rechts,'.','-')"
+
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+msgid "Zoom in by dragging."
+msgstr "Zoomen durch ziehen"
 
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
@@ -164,4 +208,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
 msgid "Draw"
 msgstr "Zeichne"
@@ -169,4 +215,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
 msgid "Draw nodes"
 msgstr "Setze Knotenpunkt"
@@ -174,4 +221,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
 msgid "Cannot add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
@@ -179,4 +227,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
 msgid "Add node"
 msgstr "Knoptenpunkt hinzufügen"
@@ -184,4 +233,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
 msgid "Add node into way"
 msgstr "Knotenpunkt in einen Weg einfügen"
@@ -189,4 +239,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
 msgid "Connect existing way to node"
 msgstr "Verbinde existierenden Weg zum Knotenpunkt"
@@ -194,4 +245,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
 msgid "Add a new node to an existing way"
 msgstr "Fügt einen Knotenpunkt in einen bestehenden Weg ein"
@@ -199,6 +251,14 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
 msgid "Add node into way and connect"
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
+
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:367
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:367
+msgid ""
+"Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-"
+"connect. Alt: new way"
+msgstr "Anklicken: Knotenpunkt anlegen. Strg: kein Wiederbenutzung/Auto-einfügen. Shift: Nicht verbinden. Alt: neuer Weg"
 
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
@@ -208,4 +268,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
 msgid "Select"
 msgstr "Auswahl"
@@ -213,4 +276,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
 msgid "Select, move and rotate objects"
 msgstr "Objekte auswählen, verschieben, und drehen"
@@ -218,9 +282,33 @@
 #: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
 #: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Maustaste loslassen um Objekete im Rechteck aus zu wählen."
+
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
+msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr "Um die Bewegung zu stoppen, Maustaste loslassen. Strg: mit dem nächsten Punkt vereinigen."
+
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
+msgid "Release the mouse button to stop rotating."
+msgstr "Um das Drehen zu stoppen, Maustaste. loslassen."
+
+#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
+#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
+msgid ""
+"Move objects by dragging; Shift to add to selection; Shift-Ctrl to rotate "
+"selected; or change selection"
+msgstr "Ziehen: Objekte verschieben. Shift: Auswahl hinzufügen. Shift-Strg: drehen oder Auswahl ändern."
+
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
@@ -228,4 +316,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
 msgid "Raw GPS data"
 msgstr "Roh GPS-Daten"
@@ -233,4 +322,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
 msgid "Downloading data"
 msgstr "Lade Daten aus dem Internet"
@@ -238,4 +328,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
 msgid "No data imported."
 msgstr "Keine Daten importiert."
@@ -243,4 +334,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Data Layer"
 msgstr "Daten-Ebene"
@@ -248,4 +340,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
 #: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
+#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap Daten"
@@ -253,4 +346,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 #: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 msgid "Preferences ..."
 msgstr "Einstellungen..."
@@ -258,4 +352,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 #: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 msgid "Open a preferences page for global settings."
 msgstr "öffnete eine globale Einstellungs-Seite."
@@ -263,4 +358,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
 #: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -268,4 +364,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:43
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:43
 msgid "Open ..."
 msgstr "Öffnen..."
@@ -273,4 +370,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:43
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:43
 msgid "Open a file."
 msgstr "Datei öffnen."
@@ -278,4 +376,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:66
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:66
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:66
 #, java-format
 msgid "Error while parsing {0}"
@@ -284,4 +383,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:69
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:69
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:69
 #, java-format
 msgid "Could not read \"{0}\""
@@ -290,4 +390,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:80
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:80
 msgid "CSV Data import for non-GPS data is not implemented yet."
 msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
@@ -295,4 +396,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:82
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:82
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:82
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -301,4 +403,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:96
 #: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:96
 #, java-format
 msgid "Markers from {0}"
@@ -309,4 +412,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
@@ -314,4 +419,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
 msgid "Move the selected nodes into a circle."
 msgstr "Verschieb gewählte Punkte in einen Kreis."
@@ -319,4 +425,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
 msgid "Please select at least four nodes."
 msgstr "Bitte mindestens vier Knotenpunkte auswählen."
@@ -326,4 +433,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
 #: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
 msgid "Rename layer"
 msgstr "Ebene Umbennen"
@@ -331,4 +440,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
 #: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
 msgid "Also rename the file"
 msgstr "Die Datei mit umbennen"
@@ -336,4 +446,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
 #: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
 #, java-format
 msgid "Could not rename the file \"{0}\"."
@@ -342,4 +453,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid "Select All"
 msgstr "Alles auswählen"
@@ -347,4 +459,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -356,4 +469,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ExitAction.java:21
 #: ../trunk/src/org/openstreetmap/josm/actions/ExitAction.java:21
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ExitAction.java:21
 msgid "Exit"
 msgstr "Beenden"
@@ -361,4 +475,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ExitAction.java:21
 #: ../trunk/src/org/openstreetmap/josm/actions/ExitAction.java:21
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ExitAction.java:21
 msgid "Exit the application."
 msgstr "Beende das Programm."
@@ -366,4 +481,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:29
 #: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:29
 msgid "Copy"
 msgstr "Kopieren"
@@ -371,4 +487,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiere gewählte Objekte in den Speicher."
@@ -376,4 +493,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:40
 #: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:40
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum kopieren auswählen."
@@ -383,4 +501,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 #: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
 msgid "Unselect All"
 msgstr "Nichts auswählen"
@@ -388,4 +508,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 #: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Keine Objekte auswählen."
@@ -393,4 +514,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split Way"
 msgstr "Weg aufspalten"
@@ -398,4 +520,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Weg am gewählten Knotenpunkt aufspalten."
@@ -403,4 +526,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
 msgid "The current selection cannot be used for splitting."
 msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten genutzt werden."
@@ -408,4 +532,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
 msgid "The selected node is not part of any way."
 msgid_plural "The selected nodes are not part of any way."
@@ -415,11 +540,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
 "way also."
-msgstr "Mindestens ein gewählter Knotenpunkt wird von mehreren Wegen benutzt. Bitte auch den Weg auswählen."
+msgstr ""
+"Mindestens ein gewählter Knotenpunkt wird von mehreren Wegen benutzt. Bitte "
+"auch den Weg auswählen."
 
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 msgid "The selected nodes do not share the same way."
 msgstr "Die gewählten Punkte Teilen sich keinen Weg. "
@@ -427,4 +556,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -434,11 +564,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:215
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:215
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:215
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
 "middle of the way.)"
-msgstr "Der Weg kann nicht an dieser Stelle geteilt werden. (Es hilft Punkte in der Mitte des Weges zu wählen)"
+msgstr ""
+"Der Weg kann nicht an dieser Stelle geteilt werden. (Es hilft Punkte in der "
+"Mitte des Weges zu wählen)"
 
 #: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
 #: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -447,4 +581,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save as ..."
 msgstr "Speichern unter ..."
@@ -452,4 +587,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save the current data to a new file."
 msgstr "Speichere die aktuellen Daten in eine neue Datei."
@@ -457,4 +593,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 #: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "OSM Server Files (.osm .xml)"
 msgstr "OSM Server Dateien (.osm .xml)"
@@ -462,4 +599,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 #: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 msgid "GPX Files (.gpx .gpx.gz)"
 msgstr "GPX Dateien (.gpx .gpx.gz)"
@@ -467,4 +605,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
 #: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
 msgid "CSV Files (.csv .txt)"
 msgstr "CSV Dateien (.csv .txt)"
@@ -472,4 +611,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
 #: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
+#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
 msgid "Join node to way"
 msgstr "Knotenpunkt in den Weg einfügen"
@@ -477,4 +617,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
 #: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
+#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
 msgid "Join a node into the nearest way segments"
 msgstr "Fügt einen Knotenpunkt an der kürzesten  Stelle in den Weg ein."
@@ -482,4 +623,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
 #: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
+#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
 msgid "Join Node and Line"
 msgstr "Vereinige Punkt und Linie"
@@ -489,4 +631,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/HelpAction.java:55
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:99
+#: ../trunk.old/src/org/openstreetmap/josm/actions/HelpAction.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:99
 msgid "Help"
 msgstr "Hilfe"
@@ -494,4 +638,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/HelpAction.java:107
 #: ../trunk/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../trunk.old/src/org/openstreetmap/josm/actions/HelpAction.java:107
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Kann nur die Hilfe Seiten von der JOSM Online Hilfe bearbeiten."
@@ -501,4 +646,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
 msgid "Align Nodes in Line"
 msgstr "Knotenpunkte in einer Line anordnen."
@@ -506,4 +653,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
 msgid "Move the selected nodes onto a line."
 msgstr "Gewählte Punkte so verschieben, das sie in einer Reihe liegen. "
@@ -511,4 +659,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
 #: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
 msgid "Please select at least three nodes."
 msgstr "Bitte mindestens drei Knotenpunkte auswählen."
@@ -518,4 +667,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
 #: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
 msgid "Reverse ways"
 msgstr "Richtung des Weges drehen"
@@ -523,4 +674,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
 #: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
 msgid "Reverse the direction of all selected ways."
 msgstr "Dreht die Richtung aller gewählter Wege um."
@@ -528,4 +680,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 #: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 msgid "Please select at least one way."
 msgstr "Bitte mindestens einen Weg wählen."
@@ -533,4 +686,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -542,4 +696,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export to GPX ..."
 msgstr "Als GPX exportieren ..."
@@ -547,4 +702,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
@@ -552,4 +708,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
 msgid "Nothing to export. Get some data first."
 msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
@@ -557,4 +714,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
 msgid "gps track description"
 msgstr "GPS Track-Beschreibung"
@@ -562,4 +720,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
 msgid "Add author information"
 msgstr "Information zum Autor hinzufügen."
@@ -567,4 +726,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
 msgid "Real name"
 msgstr "Voller Name"
@@ -572,4 +732,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
 msgid "Email"
 msgstr "E-Mail"
@@ -577,4 +738,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
@@ -582,4 +744,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
 msgid "Predefined"
 msgstr "Vordefinert"
@@ -587,4 +750,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
 msgid "Copyright year"
 msgstr "Jahr des Copyrights"
@@ -592,4 +756,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
 msgid "Keywords"
 msgstr "Schlüsselwörter"
@@ -597,4 +762,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
 msgid "Export options"
 msgstr "Export-Einstellungen"
@@ -602,4 +768,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
 #, java-format
 msgid "Error while exporting {0}"
@@ -608,4 +775,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
 msgid "Error"
 msgstr "Fehler"
@@ -613,4 +781,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
 #: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
+#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
 msgid "Choose a predefined license"
 msgstr "Wähle eine vordefinierte Lizenz"
@@ -618,4 +787,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo"
 msgstr "Rückgängig"
@@ -623,4 +793,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
@@ -628,9 +799,11 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM ..."
-msgstr "Von OSM laden ..."
+msgstr "Von OSM-Server herunterladen ..."
 
 #: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM Server laden."
@@ -638,4 +811,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:43
 #: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:43
 msgid "Download"
 msgstr "Daten herunterladen"
@@ -643,4 +817,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
 #: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:67
 msgid "Please select at least one task to download"
 msgstr "Bitte wählen Sie mindestens eine Aufgabe zum herunterladen"
@@ -648,4 +823,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:65
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:65
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:65
 msgid "About"
 msgstr "Über"
@@ -653,4 +829,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:65
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:65
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:65
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
@@ -658,4 +835,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:75
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:75
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
@@ -664,4 +842,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #, java-format
 msgid "last change at {0}"
@@ -670,4 +849,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:77
 #, java-format
 msgid "Java Version {0}"
@@ -676,4 +856,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Homepage"
 msgstr "Webseite"
@@ -681,4 +862,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Bug Reports"
 msgstr "Fehler melden:"
@@ -686,4 +868,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "News about JOSM"
 msgstr "Neues über JOSM"
@@ -693,4 +876,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:86
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 msgid "Info"
 msgstr "Info"
@@ -698,4 +883,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:87
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "Readme"
 msgstr "Bitte lesen"
@@ -703,4 +889,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:88
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:88
 msgid "Revision"
 msgstr "Version"
@@ -708,4 +895,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:89
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:89
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:89
 msgid "Contribution"
 msgstr "Mitwirkung"
@@ -715,4 +903,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:96
 #: ../trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
 msgid "Information"
 msgstr "Information"
@@ -722,4 +912,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:111
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:111
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
@@ -729,4 +921,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:116
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:116
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
 msgid "Plugins"
 msgstr "Plugins"
@@ -734,4 +928,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:120
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:120
 msgid "About JOSM..."
 msgstr "Über JOSM..."
@@ -739,4 +934,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:157
 #: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:157
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
@@ -744,4 +940,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 msgid "Duplicate"
 msgstr "Verdoppeln"
@@ -749,4 +946,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 #: ../trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by Copy and immediate Paste."
 msgstr "Verdoppelt die Selektion durch Kopieren und sofortiges Einfügen."
@@ -756,4 +954,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:99
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:99
 msgid "Paste"
 msgstr "Einfügen"
@@ -761,4 +961,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/PasteAction.java:31
 #: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Füge den Inhalt der Zwischenablage ein."
@@ -766,4 +967,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
 #: ../trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert bereits. Überschreiben?"
@@ -771,4 +973,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
 #: ../trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../trunk.old/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -776,4 +979,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "Daten"
@@ -781,4 +985,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "layer"
 msgstr "Ebene"
@@ -786,4 +991,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "selection"
 msgstr "Auswahl"
@@ -793,4 +999,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "conflict"
 msgstr "Konflikt"
@@ -798,4 +1006,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
@@ -804,4 +1013,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom the view to {0}."
@@ -810,4 +1020,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt zu dem gezoomt werden kann."
@@ -815,4 +1026,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 #: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte zu denen gezoomt werden kann"
@@ -820,4 +1032,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:62
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:62
 msgid "Upload to OSM ..."
 msgstr "Zum OSM-Server hochladen ..."
@@ -825,4 +1038,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:62
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:62
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM Server hochladen."
@@ -830,4 +1044,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:76
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:76
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:76
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
@@ -835,4 +1050,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:84
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:84
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:84
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
@@ -840,4 +1056,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:92
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:92
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:92
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
@@ -845,4 +1062,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "Upload these changes?"
 msgstr "Diese Änderungen hochladen?"
@@ -850,4 +1068,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:107
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:107
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Kann nichts hochladen."
@@ -855,4 +1074,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Es gibt ungelöste Konfilkte, die zuerst bearbeitet werden müssen."
@@ -860,4 +1080,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:133
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:133
 msgid "No changes to upload."
 msgstr "Kann keine Änderungen speichern."
@@ -865,4 +1086,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:149
 #: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:149
+#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:149
 msgid "Uploading data"
 msgstr "Sende Daten"
@@ -870,4 +1092,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
@@ -875,4 +1098,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Merge nodes into one."
 msgstr "Mehrere Knotenpunkte zu einem vereinigen."
@@ -880,4 +1104,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Punkte zum Vereinigen wählen."
@@ -885,11 +1110,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
 "to merge them?"
-msgstr "Die gewählten Punkte gehören unterschiedliche Relationen an. Sollen Sie wirklich vereint werden?"
+msgstr ""
+"Die gewählten Punkte gehören unterschiedliche Relationen an. Sollen Sie "
+"wirklich vereint werden?"
 
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
 msgid "Merge nodes with different memberships?"
 msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
@@ -899,4 +1128,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
 msgid "Enter values for all conflicts."
 msgstr "Werte für alle Konflikte eingeben."
@@ -904,9 +1135,13 @@
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr "Kann Punkte nicht vereinigen: Müsste einen Weg löschen der aber noch benutzt wird."
+msgstr ""
+"Kann Punkte nicht vereinigen: Müsste einen Weg löschen der aber noch benutzt "
+"wird."
 
 #: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
 #: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
+#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
 #, java-format
 msgid "Merge {0} nodes"
@@ -915,11 +1150,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
 "a bug."
-msgstr "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check contitions for no layer.\""
+msgstr ""
+"Interner Fehler: Bitte melden Sie den Fehler: \"cannot check contitions for "
+"no layer.\""
 
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
@@ -927,4 +1166,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid "The document contains no data. Save anyway?"
 msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
@@ -932,4 +1172,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid "Empty document"
 msgstr "Leeres Dokument"
@@ -937,4 +1178,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -946,4 +1188,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Conflicts"
 msgstr "Konflikte"
@@ -951,4 +1194,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Could not back up file."
 msgstr "Kann kein Backup der Datei erstellen."
@@ -958,4 +1202,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
 msgid "CSV output not supported yet."
 msgstr "CSV Ausgabe ist noch nicht möglich."
@@ -965,4 +1211,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
@@ -972,4 +1220,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
@@ -979,4 +1229,6 @@
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
 msgid "An error occurred while restoring backup file."
 msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
@@ -984,4 +1236,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo"
 msgstr "Wiederherstellen"
@@ -989,4 +1242,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../trunk/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Wiederhole die letzte zurückgenommene Aktion."
@@ -994,4 +1248,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:17
 msgid "New"
 msgstr "Neu"
@@ -999,4 +1254,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:17
 msgid "Create a new map."
 msgstr "Eine neue Karte erstellen."
@@ -1004,4 +1260,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:21
 #: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:21
+#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:21
 msgid "unnamed"
 msgstr "unbenannt"
@@ -1009,4 +1266,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 msgid "Combine Way"
 msgstr "Weg verbinden"
@@ -1014,4 +1272,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 msgid "Combine several ways into one."
 msgstr "Verbindet mehrere Wege zu einem."
@@ -1019,4 +1278,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen sie mindestens zwei Wege zum Verbinden."
@@ -1024,11 +1284,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
 "combine them?"
-msgstr "Die Ausgewählten Wege sind Mitglieder unterschiedlicher Relationen. Sollen sie wirklich verbunden werden?"
+msgstr ""
+"Die Ausgewählten Wege sind Mitglieder unterschiedlicher Relationen. Sollen "
+"sie wirklich verbunden werden?"
 
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
 msgid "Combine ways with different memberships?"
 msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
@@ -1036,12 +1300,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
 "reverse some of them?"
-msgstr "Die Wege können nicht in ihrer momentanen Richtung verbunden werden. "
-"Möchten Sie, daß einige Richtungen gedreht werden?"
+msgstr ""
+"Die Wege können nicht in ihrer momentanen Richtung verbunden werden. Möchten "
+"Sie, daß einige Richtungen gedreht werden?"
 
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
 msgid "Change directions?"
 msgstr "Richtung ändern?"
@@ -1049,4 +1316,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
 #, java-format
 msgid "Combine {0} ways"
@@ -1055,4 +1323,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
@@ -1060,11 +1329,15 @@
 #: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
 #: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
+#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
-msgstr "Kann Wege nicht verbinden (Sie können nicht in eine einzelne gerade Line gebracht werden)"
+msgstr ""
+"Kann Wege nicht verbinden (Sie können nicht in eine einzelne gerade Line "
+"gebracht werden)"
 
 #: ../josm/src/org/openstreetmap/josm/actions/SaveAction.java:26
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAction.java:26
 msgid "Save"
 msgstr "Speichern"
@@ -1072,4 +1345,5 @@
 #: ../josm/src/org/openstreetmap/josm/actions/SaveAction.java:26
 #: ../trunk/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAction.java:26
 msgid "Save the current data."
 msgstr "Speichere die aktuellen Daten."
@@ -1077,4 +1351,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
 #: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
+#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
 msgid "Ctrl-"
 msgstr "Strg-"
@@ -1082,4 +1357,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
 #: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
+#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
 msgid "Alt-"
 msgstr "Alt-"
@@ -1087,4 +1363,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
 #: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
+#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
 msgid "AltGr-"
 msgstr "AltGr-"
@@ -1092,4 +1369,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
 #: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
+#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
 msgid "Shift-"
 msgstr "Shift-"
@@ -1097,4 +1375,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
 #: ../trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
 msgid "Do not show again"
 msgstr "Nicht noch einmal zeigen"
@@ -1102,10 +1381,14 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 #, java-format
 msgid "An unexpected exception occurred, that may come from in the ''{0}'' plugin."
-msgstr "Einen unvorhergesehene Ausnahme trat auf, welche vom Plugin \"{0}\" kommen könnte."
+msgstr ""
+"Einen unvorhergesehene Ausnahme trat auf, welche vom Plugin \"{0}\" kommen "
+"könnte."
 
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
@@ -1114,4 +1397,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
@@ -1119,4 +1403,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
@@ -1124,18 +1409,25 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
-msgstr "Das Plugin wurde aus der Konfiguration gelöscht. Bitte starten Sie JOSM neu um das Plugin zu entfernen."
+msgstr ""
+"Das Plugin wurde aus der Konfiguration gelöscht. Bitte starten Sie JOSM neu "
+"um das Plugin zu entfernen."
 
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
 "about the problem."
-msgstr "Das Plugin konnte nicht entfernt werden. Bitte melden Sie diese Problem den Verwaltern Ihres JOSM Pakets."
+msgstr ""
+"Das Plugin konnte nicht entfernt werden. Bitte melden Sie diese Problem den "
+"Verwaltern Ihres JOSM Pakets."
 
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 msgid "Do nothing"
 msgstr "Nichts tun"
@@ -1143,4 +1435,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 msgid "Report Bug"
 msgstr "Fehler melden"
@@ -1148,4 +1441,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
 msgid ""
 "An unexpected exception occurred.\n"
@@ -1162,4 +1456,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
 msgid "Unexpected Exception"
 msgstr "Unerwarter Fehler"
@@ -1167,4 +1462,5 @@
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
 msgid ""
 "Please report a ticket at http://josm.openstreetmap.de/newticket, including "
@@ -1172,9 +1468,12 @@
 "the error and be sure to include the following information"
 msgstr ""
-"Bitte melden Sie einen Fehler unter: http://josm.openstreetmap.de/newticket, möglichst mit einer \n"
-"Beschreibung der Schritte um ihn zu reproduzieren. Fügen Sie folgende Informationen hinzu:"
+"Bitte melden Sie einen Fehler unter: http://josm.openstreetmap.de/newticket, "
+"möglichst mit einer \n"
+"Beschreibung der Schritte um ihn zu reproduzieren. Fügen Sie folgende "
+"Informationen hinzu:"
 
 #: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
 #: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
 msgid "The text has already been copied to your clipboard."
 msgstr "Der Text wurde bereits in Ihre Zwischenablage kopiert."
@@ -1182,4 +1481,5 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
 msgid "unknown"
 msgstr "unbekannt"
@@ -1187,4 +1487,5 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
 msgid "Update Plugins"
 msgstr "Plugins aktualisieren"
@@ -1192,4 +1493,5 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
 #, java-format
 msgid ""
@@ -1204,4 +1506,5 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
 #, java-format
 msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -1212,4 +1515,5 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 #, java-format
 msgid "Could not download plugin: {0} from {1}"
@@ -1218,10 +1522,14 @@
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 #, java-format
 msgid "The plugin {0} seem to be broken or could not be downloaded automatically."
-msgstr "Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch heruntergeladen werden."
+msgstr ""
+"Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch "
+"heruntergeladen werden."
 
 #: ../josm/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #: ../trunk/src/org/openstreetmap/josm/plugins/PluginException.java:18
+#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
 msgid "An error occoured in plugin {0}"
@@ -1230,4 +1538,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
 msgid "Unknown type"
 msgstr "Unbekannter Typ"
@@ -1235,4 +1544,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
 msgid "Error parsing presets.xml: "
 msgstr "Fehler beim Parsen.der Vorlagen-XMLs: "
@@ -1240,4 +1550,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
 #, java-format
 msgid "Could not read tagging preset source: {0}"
@@ -1246,4 +1557,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
 #, java-format
 msgid "Error parsing {0}: "
@@ -1252,4 +1564,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
 #, java-format
 msgid "Change {0} object"
@@ -1260,4 +1573,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
 #: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
+#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
@@ -1265,4 +1579,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 msgid "Conflict"
 msgstr "Konflikt"
@@ -1270,4 +1585,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 msgid "Merging conflicts."
 msgstr "Konflikte lösen."
@@ -1275,4 +1591,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
 msgid "Resolve"
 msgstr "Lösen"
@@ -1280,4 +1597,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Öffnet ein Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
@@ -1285,11 +1603,13 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
 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."
+"Setze die gewählten Elemente auf der Karte auf die obige Liste der "
+"ausgewählten Objekte."
 
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
 msgid "Please select something from the conflict list."
 msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
@@ -1297,4 +1617,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 msgid "Resolve Conflicts"
 msgstr "Konflikte entfernen"
@@ -1302,4 +1623,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
 msgid "Click Reload to refresh list"
 msgstr "Auf \"Neu Laden\" klicken um die Liste zu aktualisieren"
@@ -1307,4 +1629,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
 msgid "Reload"
 msgstr "Neu Laden"
@@ -1312,4 +1635,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
 msgid "Revert"
 msgstr "Rückgängig"
@@ -1317,4 +1641,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 msgid "History"
 msgstr "Geschichte"
@@ -1322,4 +1647,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 msgid "Display the history of all selected items."
 msgstr "Zeige die Versionen aller gewählten Objekte."
@@ -1327,4 +1653,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 msgid "Object"
 msgstr "Objekt"
@@ -1332,4 +1659,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 msgid "Date"
 msgstr "Datum"
@@ -1337,4 +1665,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lade alle gewählten Objekte neu und aktualisiere die Liste."
@@ -1344,4 +1673,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
 msgid "Not implemented yet."
 msgstr "Noch nicht fertig."
@@ -1349,12 +1680,15 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
 msgid ""
 "Revert the state of all currently selected objects to the version selected "
 "in the history list."
-msgstr "Alle ausgewählten Objekte in den Zustand zurücksetzen, der in der "
+msgstr ""
+"Alle ausgewählten Objekte in den Zustand zurücksetzen, der in der "
 "Versionsliste ausgewählt ist."
 
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
@@ -1362,4 +1696,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 msgid "Open a selection list window."
 msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
@@ -1367,4 +1702,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 msgid "Command Stack"
 msgstr "Befehlsliste"
@@ -1372,4 +1708,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
@@ -1377,4 +1714,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
 msgid "Edit Relation"
 msgstr "Relation bearbeiten"
@@ -1388,4 +1726,8 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
 msgid "Key"
 msgstr "Schlüssel"
@@ -1399,4 +1741,8 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
 msgid "Value"
 msgstr "Wert"
@@ -1406,4 +1752,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 msgid "Role"
 msgstr "Rolle"
@@ -1411,4 +1759,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
 msgid "Occupied By"
 msgstr "Belegt durch"
@@ -1416,4 +1765,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (leerer Wert löscht das Tag)"
@@ -1421,4 +1771,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
 msgid "Members"
 msgstr "Mitglieder"
@@ -1426,4 +1777,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 msgid "Add Selected"
 msgstr "Gewähltes hinzufügen"
@@ -1431,4 +1783,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 msgid "Add all currently selected objects as members"
 msgstr "Füge alle gewählten Objekte als Mitglied hinzu"
@@ -1436,4 +1789,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
 msgid "Remove the member in the current table row from this relation"
 msgstr "Entferne das Mitglied in der aktuelle Tabellenzeile von dieser Relation."
@@ -1441,4 +1795,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Übernehme das Mitglied der Aktuellen Tabellenzeile als JOSM Auswahl."
@@ -1446,4 +1801,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
 msgid "Delete the selected layer."
 msgstr "Ausgewählte Ebene löschen."
@@ -1451,4 +1807,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
 msgid "Do you really want to delete the whole layer?"
 msgstr "Soll wirklich die gesamte Ebene gelöscht werden?"
@@ -1456,4 +1813,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
 msgid "Show/Hide"
 msgstr "Zeigen/Verstecken"
@@ -1461,4 +1819,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
 msgid "Toggle visible state of the selected layer."
 msgstr "Schaltet die Ebene zwischen sichtbar und unsichbar um."
@@ -1466,4 +1825,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
 msgid "Show/Hide Text"
 msgstr "Zeige/Verstecke Text"
@@ -1471,4 +1831,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
 msgid "Toggle visible state of the marker text."
 msgstr "Schaltet den Merker Text zwischen sichtbar und unsichbar um."
@@ -1476,4 +1837,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Layers"
 msgstr "Ebenen"
@@ -1481,4 +1843,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Open a list of all loaded layers."
 msgstr "Öffnet eine Liste alle geladenen Ebenen."
@@ -1486,4 +1849,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Reihe höher schieben"
@@ -1491,4 +1855,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Reihe tiefer schieben."
@@ -1496,4 +1861,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
 msgid "Merge the layer directly below into the selected layer."
 msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
@@ -1501,4 +1867,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 msgid "Relations"
 msgstr "Relationen"
@@ -1506,4 +1873,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 msgid "Open a list of all relations."
 msgstr "Öffnet eine Liste aller Relationen."
@@ -1511,4 +1879,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 msgid "Add Relation"
 msgstr "Relation hinzufügen"
@@ -1516,4 +1885,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
@@ -1531,4 +1901,10 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:95
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:71
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:95
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1536,4 +1912,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
 msgid "Open an editor for the selected relation"
 msgstr "Öffne einen Editor für die gewählte Relation"
@@ -1541,4 +1918,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
@@ -1546,4 +1924,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 msgid "Authors"
 msgstr "Autoren"
@@ -1551,9 +1930,13 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 msgid "Open a list of people working on the selected objects."
-msgstr "Öffne eine Liste von Menschen, die an den gewählten Objekten gearbeitet haben."
+msgstr ""
+"Öffne eine Liste von Menschen, die an den gewählten Objekten gearbeitet "
+"haben."
 
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 msgid "Author"
 msgstr "Autor"
@@ -1561,4 +1944,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 msgid "# Objects"
 msgstr "# Objekte"
@@ -1566,4 +1950,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte für die Einstellungen geändert werden sollen."
@@ -1573,4 +1958,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
 #, java-format
 msgid "This will change {0} object."
@@ -1581,4 +1968,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
 msgid "An empty value deletes the key."
 msgstr "Ein leerer Wert löscht den Schlüssel."
@@ -1588,4 +1976,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 msgid "Change values?"
 msgstr "Wert ändern?"
@@ -1599,4 +1989,8 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
 msgid "<different>"
 msgstr "<verschieden>"
@@ -1604,4 +1998,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
 #, java-format
 msgid "Change properties of {0} object"
@@ -1612,9 +2007,13 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Please select objects for which you want to change properties."
-msgstr "Bitte wählen Sie die Objekte für die die Einstellungen geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte für die die Einstellungen geändert werden "
+"sollen."
 
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
@@ -1622,4 +2021,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
@@ -1627,4 +2027,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 msgid "Properties/Memberships"
 msgstr "Einstellungen/Mitgliedschaften"
@@ -1632,4 +2033,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 msgid "Properties for selected objects."
 msgstr "Einstellungen der ausgewählten Objekte."
@@ -1637,4 +2039,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 msgid "Member Of"
 msgstr "Mitglied von"
@@ -1646,4 +2049,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:414
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
 msgid "Please select the row to edit."
 msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
@@ -1655,4 +2061,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:419
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die zu löschende Zeile."
@@ -1670,4 +2079,10 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
 #: ../trunk/src/org/openstreetmap/josm/command/AddCommand.java:67
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../trunk.old/src/org/openstreetmap/josm/command/AddCommand.java:67
 msgid "Add"
 msgstr "Hinzufügen"
@@ -1675,4 +2090,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
 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"
@@ -1680,4 +2096,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte ändern"
@@ -1685,4 +2102,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
 #: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
+#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
 msgid "Delete the selected key in all objects"
 msgstr "Den Schlüssel aus allen Objekten löschen"
@@ -1690,4 +2108,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
 msgid "Keep backup files"
 msgstr "Backupdateien erstellen"
@@ -1695,4 +2114,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Beim Speichern, behalte eine Sicherheitskopie endend auf ~"
@@ -1700,4 +2120,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
@@ -1705,4 +2126,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
@@ -1712,4 +2134,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 msgid "Tagging preset source"
 msgstr "Voreinstellungs-Quelle"
@@ -1717,13 +2141,15 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
 msgid ""
 "The sources (url or filename) of tagging preset definition files. See http://"
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
-"Die Quellen (URL oder Dateiname) für Vorlagendateien. Siehe http://"
-"josm.openstreetmap.de/wiki/TaggingPresets für Hilfe."
+"Die Quellen (URL oder Dateiname) für Vorlagendateien. Siehe http://josm."
+"openstreetmap.de/wiki/TaggingPresets für Hilfe."
 
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 msgid "Add a new tagging preset source to the list."
 msgstr "Eine neue Voreinstellungsquelle zu der Liste hinzufügen"
@@ -1731,4 +2157,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle löschen."
@@ -1736,4 +2163,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 msgid "Tagging Presets"
 msgstr "Tagging Vorlagen"
@@ -1741,4 +2169,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 msgid "Tagging preset sources"
 msgstr "Voreinstellungs-Quellen"
@@ -1746,4 +2175,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 msgid "Advanced Preferences"
 msgstr "Erweiterte Einstellungen"
@@ -1751,4 +2181,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Setzt Einstellungseinträge direkt. Bitte vorsichtig benutzen!"
@@ -1756,4 +2187,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
 msgid "Enter a new key/value pair"
 msgstr "Füge ein neues Schlüssel/Wert Paar hinzu."
@@ -1761,4 +2193,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
 #, java-format
 msgid "New value for {0}"
@@ -1767,4 +2200,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
 msgid "Separator"
 msgstr "Trenner"
@@ -1772,4 +2206,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis URL des OSM Servers (REST API)"
@@ -1777,4 +2212,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 msgid "Login name (email) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM Server."
@@ -1782,4 +2218,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
@@ -1789,4 +2226,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
 msgid "Base Server URL"
 msgstr "Basis Rechner URL"
@@ -1794,4 +2232,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "OSM username (email)"
 msgstr "OSM-Benutzername (E-Mail)"
@@ -1799,4 +2238,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid "OSM password"
 msgstr "OSM Passwort"
@@ -1804,4 +2244,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1815,4 +2256,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1833,4 +2275,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV import definition (leer: lese aus der ersten Zeile der Daten)"
@@ -1838,4 +2281,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Zeichne Linien zwischen Roh GPS Punkten."
@@ -1843,4 +2287,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
 msgid "Force lines if no segments imported."
 msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
@@ -1848,4 +2293,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
 msgid "Draw large GPS points."
 msgstr "Zeiche große GPS Punkte."
@@ -1853,4 +2299,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
 msgid "Draw Direction Arrows"
 msgstr "Zeichne Richtungspfeile"
@@ -1858,4 +2305,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
 msgid "Draw segment order numbers"
 msgstr "Segment Ordnungsnummer anzeigen"
@@ -1863,4 +2311,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
 msgid "Draw boundaries of downloaded data"
 msgstr "Zeige Grenzen der geladenen Daten"
@@ -1868,4 +2317,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
 msgid "Draw inactive layers in other color"
 msgstr "Zeichne inaktive Ebenen in anderer Farbe"
@@ -1873,4 +2323,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid ""
 "If your gps device draw too few lines, select this to draw lines along your "
@@ -1882,4 +2333,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "Force drawing of lines if the imported data contain no line information."
 msgstr ""
@@ -1889,4 +2341,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw larger dots for the GPS points."
 msgstr "Zeichnet größere Punkte für GPS-Punkte."
@@ -1894,4 +2347,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 msgid "Draw direction hints for all segments."
 msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
@@ -1899,4 +2353,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zeige die Ordnungsnummer für alle Segmente innerhalb des Weges."
@@ -1904,4 +2359,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM Server geladenen Bereichs anzeigen."
@@ -1909,4 +2365,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zeichne inaktive Daten-Ebenen in einer anderen Farbe."
@@ -1914,4 +2371,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
 msgid "Map Projection"
 msgstr "Projektionsmethode"
@@ -1919,4 +2377,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
 msgid "Projection method"
 msgstr "Projektionsmethode"
@@ -1924,4 +2383,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
 msgid "Color"
 msgstr "Farbe"
@@ -1929,4 +2389,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
 msgid "Name"
 msgstr "Name"
@@ -1934,4 +2395,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
 msgid "Choose"
 msgstr "Wähle"
@@ -1939,4 +2401,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
 msgid "Please select a color."
 msgstr "Bitte eine Farbe wählen."
@@ -1944,4 +2407,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
 #, java-format
 msgid "Choose a color for {0}"
@@ -1950,4 +2414,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
@@ -1955,4 +2420,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 msgid "Colors"
 msgstr "Farben"
@@ -1960,4 +2426,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 msgid "background"
 msgstr "Hintergrund"
@@ -1973,4 +2440,9 @@
 #: ../trunk/src/org/openstreetmap/josm/command/MoveCommand.java:121
 #: ../trunk/src/org/openstreetmap/josm/command/RotateCommand.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
+#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:62
+#: ../trunk.old/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/command/RotateCommand.java:134
 msgid "node"
 msgid_plural "nodes"
@@ -1980,4 +2452,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 msgid "segment"
 msgstr "Abschnitt"
@@ -1989,4 +2462,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:170
 #: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:170
+#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
 msgid "way"
 msgid_plural "ways"
@@ -1996,4 +2472,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "incomplete way"
 msgstr "unvollständiger Weg"
@@ -2001,4 +2478,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "selected"
 msgstr "gewählt"
@@ -2006,4 +2484,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 msgid "gps point"
 msgstr "GPS Punkt"
@@ -2011,4 +2490,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
 msgid "scale"
 msgstr "Skala"
@@ -2016,4 +2496,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
 msgid "inactive"
 msgstr "Inaktiv"
@@ -2021,4 +2502,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
 msgid "Configure available plugins."
 msgstr "Bearbeite verfügbare Plugins."
@@ -2026,4 +2508,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Liste laden"
@@ -2031,4 +2514,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -2039,4 +2523,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
 msgid "No plugin information found."
 msgstr "Keine Plugin Informationen gefunden."
@@ -2046,4 +2531,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 msgid "Update"
 msgstr "Update"
@@ -2051,4 +2538,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
 msgid "Configure Sites ..."
 msgstr "Seiten Konfigurieren ...."
@@ -2060,4 +2548,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:120
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 msgid "Add either site-josm.xml or Wiki Pages."
 msgstr "Bitte entwerde site-josm.xml oder Wiki Seiten hinzufügen."
@@ -2067,4 +2558,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Please select an entry."
 msgstr "Bitte wählen Sie einen Eintrag."
@@ -2072,4 +2565,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
 msgid "Configure Plugin Sites"
 msgstr "Plugin Seiten berarbeiten"
@@ -2077,4 +2571,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
@@ -2082,4 +2577,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #, java-format
 msgid ""
@@ -2094,4 +2590,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM verbunden"
@@ -2099,4 +2596,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -2105,4 +2603,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
 #, java-format
 msgid ""
@@ -2117,4 +2616,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins holen"
@@ -2122,4 +2622,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
@@ -2127,4 +2628,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -2134,4 +2636,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
@@ -2139,4 +2642,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Connection Settings for the OSM server."
 msgstr "Verbinungseinstellungen zum OSM Server."
@@ -2144,4 +2648,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
@@ -2149,4 +2654,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
@@ -2154,4 +2660,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
 #: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
 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."
@@ -2159,4 +2666,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
 msgid "You can paste an URL here to download the area."
 msgstr "Sie können hier eine URL einfügen um diesen Bereich zu laden."
@@ -2164,4 +2672,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "min lat"
 msgstr "min Breite"
@@ -2169,4 +2678,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid "min lon"
 msgstr "min Länge"
@@ -2174,4 +2684,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
 msgid "max lat"
 msgstr "max Breite"
@@ -2179,4 +2690,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
 msgid "max lon"
 msgstr "max Länge"
@@ -2184,4 +2696,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
 msgid "URL from www.openstreetmap.org"
 msgstr "URL von www.openstreetmap.org"
@@ -2189,4 +2702,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten"
@@ -2194,4 +2708,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Bereich okay, Größe ist wahrscheinlich akzeptabel für den Server"
@@ -2199,4 +2714,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
 #: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
 msgid "Data Sources and Types"
 msgstr "Datenquellen und Typen"
@@ -2204,4 +2720,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 #: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Als neue Ebene laden"
@@ -2209,4 +2726,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
 #: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
 msgid "Download Area"
 msgstr "Bereich laden"
@@ -2214,4 +2732,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
 #: ../trunk/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
 msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 msgstr "Sie können die Maus oder Strg-Pfeiltasten /./ um zu zoomen und zu zielen."
@@ -2219,4 +2738,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
 msgid "Please enter the desired coordinates first."
 msgstr "Bitte wählen Sie zuerst die Koordinaten."
@@ -2224,4 +2744,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
 msgid "Please enter a name for the location."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
@@ -2229,4 +2750,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 msgid "Remove"
 msgstr "Entfernen"
@@ -2234,4 +2756,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie ein Lesezeichen."
@@ -2239,4 +2762,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Es gab einen Fehler beim Anzeigen der URL für diesen Merker"
@@ -2244,4 +2768,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "(URL was: "
 msgstr "(Die URL war:"
@@ -2249,4 +2774,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "Error displaying URL"
 msgstr "Fehler beim Anzeigen der URL"
@@ -2254,4 +2780,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 msgid "name"
 msgstr "Name"
@@ -2259,4 +2786,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 msgid "symbol"
 msgstr "Symbol"
@@ -2264,4 +2792,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
 msgid "There was an error while trying to play the sound file for this marker."
 msgstr "Es gab einen Fehler beim abspielen der Ton-Aufzeichnung für diesen Wegpunkt."
@@ -2269,4 +2798,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
 msgid "Error playing sound"
 msgstr "Fehler bei der Klang Ausgabe."
@@ -2274,4 +2804,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
 msgid "marker"
 msgid_plural "markers"
@@ -2281,4 +2812,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -2293,4 +2825,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
 msgid "Customize Color"
 msgstr "Farben anpassen"
@@ -2302,4 +2837,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 msgid "OK"
 msgstr "OK"
@@ -2313,4 +2851,8 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -2322,4 +2864,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 msgid "Default"
 msgstr "Voreinstellung"
@@ -2331,4 +2876,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:158
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 msgid "Choose a color"
 msgstr "Farbe auswählen"
@@ -2338,4 +2886,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
@@ -2345,4 +2895,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -2356,4 +2908,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
@@ -2365,4 +2919,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "Converted from: {0}"
@@ -2373,4 +2930,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:274
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:274
 msgid "Upload this trace..."
 msgstr "Den Track hochladen ...."
@@ -2380,8 +2939,12 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:278
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:278
 msgid ""
 "<html>This functionality has been added only recently. Please<br>use with "
 "care and check if it works as expected.</html>"
-msgstr "<html>Diese Funktionalität ist sehr neu. Bitte Vorsichtig<br> benutzen und prüfen ob es wie erwartet funktioniert.</html>"
+msgstr ""
+"<html>Diese Funktionalität ist sehr neu. Bitte Vorsichtig<br> benutzen und "
+"prüfen ob es wie erwartet funktioniert.</html>"
 
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
@@ -2391,4 +2954,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
 msgid "Upload track filtered by JOSM"
 msgstr "Track durch JOSM gefiltert hochladen"
@@ -2396,4 +2962,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
 #, java-format
 msgid "Upload raw file: {0}"
@@ -2404,4 +2971,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 msgid "Upload raw file: "
 msgstr "Rohdaten hochladen: "
@@ -2411,4 +2980,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
 msgid "Description:"
 msgstr "Beschreibung:"
@@ -2416,4 +2987,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
 msgid "Tags:"
 msgstr "Tags:"
@@ -2423,4 +2995,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:310
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:310
 msgid "GPX-Upload"
 msgstr "GPX-Upload"
@@ -2432,4 +3006,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
@@ -2437,4 +3014,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
 msgid "track"
 msgid_plural "tracks"
@@ -2444,4 +3022,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
 msgid "point"
 msgid_plural "points"
@@ -2451,4 +3030,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
 #, java-format
 msgid "a track with {0} point"
@@ -2459,4 +3039,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #, java-format
 msgid "{0} consists of {1} track"
@@ -2467,4 +3048,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #, java-format
 msgid "{0} point"
@@ -2477,4 +3059,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
 msgid "Customize line drawing"
 msgstr "Linien-Aussehen anpassen"
@@ -2484,4 +3068,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
 msgid "Use global settings."
 msgstr "Globale Einstellungen benutzen."
@@ -2491,4 +3077,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
 msgid "Draw lines between points for this layer."
 msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
@@ -2498,4 +3086,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
 msgid "Do not draw lines between points for this layer."
 msgstr "Zeichne keine Linien zwischen Punkten dieser Ebene."
@@ -2505,4 +3095,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
 msgid "Select line drawing options"
 msgstr "Wähle Linienausehen"
@@ -2510,4 +3102,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:191
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:191
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:191
 msgid "There were conflicts during import."
 msgstr "Es gab Konflikte beim Importieren."
@@ -2515,4 +3108,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
 #, java-format
 msgid "{0} consists of:"
@@ -2521,4 +3115,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:293
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:293
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:293
 #, java-format
 msgid " ({0} deleted.)"
@@ -2527,4 +3122,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:373
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:373
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:373
 msgid "Convert to GPX layer"
 msgstr "Zur GPX-Ebene konvertieren"
@@ -2532,4 +3128,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
 #, java-format
 msgid "Images for {0}"
@@ -2538,4 +3135,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
 msgid "Read GPX..."
 msgstr "Lese GPX..."
@@ -2543,4 +3141,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
 #, java-format
 msgid "No time for point {0} x {1}"
@@ -2549,4 +3148,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
@@ -2555,4 +3155,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
@@ -2560,4 +3161,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
 #, java-format
 msgid "Reading {0}..."
@@ -2566,4 +3168,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
 msgid "Geotagged Images"
 msgstr "Bilder mit Ortsbezug"
@@ -2571,4 +3174,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
 #, java-format
 msgid "GPS start: {0}"
@@ -2577,4 +3181,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 #, java-format
 msgid "GPS end: {0}"
@@ -2583,4 +3188,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
 #, java-format
 msgid "current delta: {0}s"
@@ -2589,4 +3195,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
@@ -2594,4 +3201,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 msgid "image"
 msgid_plural "images"
@@ -2601,4 +3209,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 #, java-format
 msgid "{0} within the track."
@@ -2607,4 +3216,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
 msgid "Sync clock"
 msgstr "Uhrzeit Synchornisieren"
@@ -2614,4 +3224,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG Bilder (*.jpg)"
@@ -2619,4 +3231,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
@@ -2625,4 +3238,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
@@ -2631,4 +3245,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
 msgid "Image"
 msgstr "Bild"
@@ -2636,4 +3251,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
@@ -2641,4 +3257,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
@@ -2646,4 +3263,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
 msgid "Syncronize Time with GPS Unit"
 msgstr "Zeit mit GPS Gerät synchronisieren"
@@ -2653,4 +3271,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
@@ -2658,4 +3278,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 msgid "Import images"
 msgstr "Bilder importieren"
@@ -2663,4 +3284,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 #: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 msgid "Tags (keywords in GPX):"
 msgstr "Tags (Schlüsselworte in GPX):"
@@ -2668,4 +3290,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/BookmarkList.java:43
 #: ../trunk/src/org/openstreetmap/josm/gui/BookmarkList.java:43
+#: ../trunk.old/src/org/openstreetmap/josm/gui/BookmarkList.java:43
 msgid "Could not read bookmarks."
 msgstr "Kann Lesezeichen nicht lesen."
@@ -2673,4 +3296,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/BookmarkList.java:57
 #: ../trunk/src/org/openstreetmap/josm/gui/BookmarkList.java:57
+#: ../trunk.old/src/org/openstreetmap/josm/gui/BookmarkList.java:57
 msgid "Could not write bookmark."
 msgstr "Kann Lesezeichen nicht schreiben."
@@ -2680,4 +3304,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/MapView.java:112
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MapView.java:112
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Java OpenStreetMap - Editor"
 msgstr "Java OpenStreetMap - Editor"
@@ -2685,4 +3311,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../trunk/src/org/openstreetmap/josm/gui/MapView.java:157
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MapView.java:157
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
@@ -2690,4 +3317,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:126
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:126
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap - Editor"
@@ -2695,4 +3323,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:127
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:127
 msgid "usage"
 msgstr "Benutzung"
@@ -2700,4 +3329,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:129
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:129
 msgid "options"
 msgstr "Optionen"
@@ -2705,4 +3335,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:130
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Show this help"
 msgstr "Zeige diese Hilfe"
@@ -2710,4 +3341,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:131
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:131
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:131
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
@@ -2715,4 +3347,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:132
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "Download the bounding box"
 msgstr "Lade den Zeichen-Kasten"
@@ -2720,4 +3353,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:133
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:133
 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)"
@@ -2725,4 +3359,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
@@ -2730,4 +3365,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box as raw gps"
 msgstr "Lade den Zeichen-Kasten als Roh-GPS"
@@ -2735,4 +3371,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:136
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Select with the given search"
 msgstr "Auswählen mit der angegebenen Suche"
@@ -2740,4 +3377,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Don't launch in fullscreen mode"
 msgstr "Nicht im Vollbildmodus starten"
@@ -2745,4 +3383,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Defaultwerte zurücksetzen"
@@ -2750,4 +3389,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Set the language. Example: "
 msgstr "Die Sprache Einstellen. Beispiel:"
@@ -2755,4 +3395,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "examples"
 msgstr "Beispiele"
@@ -2760,4 +3401,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2770,4 +3412,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
@@ -2775,4 +3418,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:94
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:94
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:94
 msgid "File"
 msgstr "Datei"
@@ -2780,4 +3424,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:96
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:96
 msgid "View"
 msgstr "Anzeigen"
@@ -2785,4 +3430,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:97
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:97
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:97
 msgid "Tools"
 msgstr "Werkzeuge"
@@ -2790,4 +3436,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:98
 #: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:98
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:98
 msgid "Presets"
 msgstr "Vorlagen"
@@ -2795,4 +3442,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 #: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
 msgstr "Versuche OSM Server zu erreichen..."
@@ -2800,4 +3448,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MapStatus.java:261
 #: ../trunk/src/org/openstreetmap/josm/gui/MapStatus.java:261
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MapStatus.java:261
 msgid "Lat/Lon"
 msgstr "Breite/Länge"
@@ -2805,4 +3454,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
 #, java-format
 msgid "{0} object has conflicts:"
@@ -2813,4 +3463,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
 msgid "my version:"
 msgstr "meine Version:"
@@ -2818,4 +3469,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "their version:"
 msgstr "deren Version:"
@@ -2823,4 +3475,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 #: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "resolved version:"
 msgstr "neue Version:"
@@ -2828,4 +3481,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
 #: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
 msgid "Error while parsing"
 msgstr "Fehler beim Parsen"
@@ -2833,9 +3487,53 @@
 #: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
 #: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
+#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
+#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:52
+#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:52
+msgid ""
+"<html><h2>You are running the latest \"modeless\" JOSM version.</h2><h3>This "
+"version (almost) does away with the old edit modes, like \"add node and "
+"connect\"<br>etc.; instead, there are only four modes: zoom, select, edit, "
+"and delete.<br>The edit mode will do what you want in most cases (also see "
+"the mini help about<br>modifier keys at the bottom of the screen).</"
+"h3><h3>If this is the first time you use JOSM since 08 October, you will "
+"also find that with the<br>0.5 API, segments have gone and relations have "
+"been added. You will find general<br>information about the changes on the "
+"OSM wiki, and there's a page on using relations<br>in the JOSM online help.</"
+"h3>"
+msgstr ""
+"<html><h2>Es läuft die neuste \"Modilose\" JOSM Version.</h2> <h3>Diese "
+"Version verzichtet (fast vollständig) auf die alten Edit-Modi, wie z.B.  "
+"\"Füge <br> Knotenpunkt ein und verbinde\"; stattdessen gibt es nur vier "
+"Modi: Zoomen,<br> Auswählen, Bearbeiten und Löschen. Der Beabreiten-Modus "
+"wird in den meisten <br> Fällen das gewünschte erfüllen (es gibt außerdem "
+"eine Mini-Hilfe über die Steuertasten <br> in der Statusleiste).</"
+"h3><h3>Wenn dies das erste mal nach dem 8. Oktober ist, das sie JOSM "
+"benutzen, <br>werden Sie  bemerken, das mit der API Version 0.5, Abschitte "
+"verschwunden sind<br>und Relationen hinzugefügt wurden. Mehr Informatioenn "
+"über die Ãnderungen findet man <br>im OSM Wiki. Eine Beschreibung wie man "
+"Relationen benutzen kann findet sich auch in der <br>JOSM Online Hilfe.</h3>"
+
+#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:72
+#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:72
+msgid ""
+"<html><h3>Your preferences have been changed by removing <b>osm-server."
+"version</b> and/or <b>osm-server.additional-versions</b> which were still "
+"referring to 0.4.</h3></html>"
+msgstr ""
+"<html><h3>Die Einstellungen wurden geändert. Es wurd die <b>osm-server."
+"version</b> und/oder<b>osm-server.additional-versions</b> entfernt, weil "
+"diese auf die Version 0.4 verwiesen haben.</h3></html>"
+
+#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+msgid "Read the [Wiki page on API 0.5]"
+msgstr "Lese die [Wiki Seite über API 0.5]"
+
 #: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:85
 #: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:85
+#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:85
 msgid "Getting Started"
 msgstr "Los gehts"
@@ -2843,4 +3541,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:86
 #: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:86
 msgid "[Download] some data from the OSM server"
 msgstr "Kartendaten vom OSM Server laden"
@@ -2848,4 +3547,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:90
 #: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:90
+#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:90
 msgid "Getting Help"
 msgstr "Hilfe bekommen"
@@ -2853,4 +3553,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:91
 #: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:91
+#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:91
 msgid "Open the [online help] (english only)"
 msgstr "Öffne die [Online Hilfe] (nur in Englisch)"
@@ -2858,4 +3559,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:92
 #: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:92
+#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:92
 msgid "Join the newbie [mailing list]"
 msgstr "Mitglied in der Newbie [Mailingliste] werden"
@@ -2863,4 +3565,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Upload Preferences"
 msgstr "Einstellungen Hochladen"
@@ -2868,4 +3571,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Upload the current preferences to the server"
 msgstr "Die jetzigen Einstellungen auf dem OSM Server speichern"
@@ -2877,4 +3581,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:53
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:52
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:53
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:54
 msgid "string"
 msgstr "Zeichenkette"
@@ -2882,4 +3589,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:52
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:52
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:52
 msgid "Name of the user."
 msgstr "Name des Benutzers."
@@ -2887,4 +3595,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:53
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:53
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:53
 msgid "OSM Password."
 msgstr "OSM Passwort."
@@ -2892,4 +3601,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:54
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:54
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Ändere die Applet Größe auf den angegeben Wert (Format: BREITExHÖHE)"
@@ -2901,4 +3611,7 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:56
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "string;string;..."
 msgstr "Zeichenkette;Zeichenkette;..."
@@ -2906,4 +3619,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:55
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
@@ -2915,4 +3629,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:56
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
@@ -2924,4 +3639,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:57
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -2933,4 +3649,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "any"
 msgstr "jeder"
@@ -2938,4 +3655,5 @@
 #: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
@@ -2945,4 +3663,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:83
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:74
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:83
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:74
 msgid "Username"
 msgstr "Benutzername"
@@ -2952,4 +3672,6 @@
 #: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:86
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:77
 msgid "Password"
 msgstr "Passwort"
@@ -2957,4 +3679,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/GpxReader.java:262
 #: ../trunk/src/org/openstreetmap/josm/io/GpxReader.java:262
+#: ../trunk.old/src/org/openstreetmap/josm/io/GpxReader.java:262
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parser Fehler: ungültige Dokumentstruktur für ein GPX Dokument"
@@ -2964,4 +3687,6 @@
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:129
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:129
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:131
 msgid "Unknown version"
 msgstr "Version unbekannt."
@@ -2969,4 +3694,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:159
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:159
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:159
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
@@ -2974,4 +3700,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:162
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:162
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:162
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
@@ -2979,4 +3706,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:174
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:174
 msgid "Found <member> tag on non-relation."
 msgstr "Habe <member> Tag auf einer Nicht-Relation gefunnden."
@@ -2984,4 +3712,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:182
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:182
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:182
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständiger <member> Beschreibung mit ref=0"
@@ -2989,4 +3718,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:196
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:196
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:196
 msgid "NullPointerException, Possibly some missing tags."
 msgstr "NullPointerException, vielleicht fehlende Tags."
@@ -2994,4 +3724,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:225
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:225
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:225
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
@@ -2999,4 +3730,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:265
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:265
 #, java-format
 msgid "Missing required attribute \"{0}\"."
@@ -3005,4 +3737,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:406
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:406
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:406
 msgid "Preparing data..."
 msgstr "Bereite Daten vor ...."
@@ -3010,4 +3743,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:417
 #: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:417
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:417
 msgid "Illformed Node id"
 msgstr "Kranke Knotenpunkt Id"
@@ -3015,4 +3749,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 #: ../trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 #, java-format
 msgid "Upload {0} {1} ({2})..."
@@ -3023,4 +3758,6 @@
 #: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
 #: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:92
+#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:92
 msgid "Contacting OSM Server..."
 msgstr "Verbinde zu OSM Server ...."
@@ -3028,4 +3765,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:49
 #: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:49
+#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:49
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -3034,4 +3772,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
 #: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
 msgid "Downloading OSM data..."
 msgstr "Hole OSM-Daten..."
@@ -3039,4 +3778,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:73
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
@@ -3044,4 +3784,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:80
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
@@ -3049,4 +3790,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:84
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
@@ -3054,4 +3796,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:87
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:87
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Enter Password"
 msgstr "Passwort eingeben"
@@ -3059,4 +3802,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:122
 #: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:122
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:122
 msgid "Aborting..."
 msgstr "Abruch..."
@@ -3064,4 +3808,5 @@
 #: ../josm/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 #: ../trunk/src/org/openstreetmap/josm/io/OsmIdReader.java:38
+#: ../trunk.old/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
 msgstr "Fehler beim parsen."
@@ -3069,4 +3814,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
 #: ../trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
 msgid "different"
 msgstr "verschieden"
@@ -3074,4 +3820,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
 #: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
 msgid "deleted"
 msgstr "gelöscht"
@@ -3079,4 +3826,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 #: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 msgid "true"
 msgstr "wahr"
@@ -3084,4 +3832,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 #: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 msgid "false"
 msgstr "falsch"
@@ -3089,4 +3838,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
 #: ../trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
 msgid "position"
 msgstr "Position"
@@ -3094,4 +3844,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
 #: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
+#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
 #, java-format
 msgid "{0} node"
@@ -3102,4 +3853,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
 #: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
 msgid "relation"
 msgid_plural "relations"
@@ -3109,4 +3861,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
 #: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
 #, java-format
 msgid "Preferences stored on {0}"
@@ -3115,4 +3868,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
 #: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
@@ -3121,4 +3875,5 @@
 #: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
 #: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
@@ -3126,4 +3881,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #: ../trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#: ../trunk.old/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
@@ -3132,4 +3888,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/ChangeCommand.java:44
 #: ../trunk/src/org/openstreetmap/josm/command/ChangeCommand.java:44
+#: ../trunk.old/src/org/openstreetmap/josm/command/ChangeCommand.java:44
 msgid "Change"
 msgstr "Ändere"
@@ -3137,4 +3894,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/MoveCommand.java:121
 #: ../trunk/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#: ../trunk.old/src/org/openstreetmap/josm/command/MoveCommand.java:121
 msgid "Move"
 msgstr "Verschiebe"
@@ -3142,4 +3900,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/SequenceCommand.java:60
 #: ../trunk/src/org/openstreetmap/josm/command/SequenceCommand.java:60
+#: ../trunk.old/src/org/openstreetmap/josm/command/SequenceCommand.java:60
 msgid "Sequence"
 msgstr "Abfolge"
@@ -3147,4 +3906,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
+#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #, java-format
 msgid "Remove \"{0}\" for"
@@ -3153,4 +3913,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
+#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #, java-format
 msgid "Set {0}={1} for"
@@ -3159,4 +3920,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
 #: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
+#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
 msgid "object"
 msgid_plural "objects"
@@ -3166,4 +3928,5 @@
 #: ../josm/src/org/openstreetmap/josm/command/RotateCommand.java:134
 #: ../trunk/src/org/openstreetmap/josm/command/RotateCommand.java:134
+#: ../trunk.old/src/org/openstreetmap/josm/command/RotateCommand.java:134
 msgid "Rotate"
 msgstr "Drehen"
@@ -3171,4 +3934,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:220
 #: ../trunk/src/org/openstreetmap/josm/Main.java:220
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:220
 #, java-format
 msgid "Plugin not found: {0}."
@@ -3177,4 +3941,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:248
 #: ../trunk/src/org/openstreetmap/josm/Main.java:248
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:248
 #, java-format
 msgid "Could not load plugin {0}. Deleted from preferences."
@@ -3183,4 +3948,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:315
 #: ../trunk/src/org/openstreetmap/josm/Main.java:315
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:315
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -3190,4 +3956,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:385
 #: ../trunk/src/org/openstreetmap/josm/Main.java:385
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:385
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
@@ -3195,4 +3962,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:387
 #: ../trunk/src/org/openstreetmap/josm/Main.java:387
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:387
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und wirklich beenden?"
@@ -3200,4 +3968,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:388
 #: ../trunk/src/org/openstreetmap/josm/Main.java:388
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:388
 msgid "Unsaved Changes"
 msgstr "Daten nicht gespeichert"
@@ -3205,4 +3974,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:400
 #: ../trunk/src/org/openstreetmap/josm/Main.java:400
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:400
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
@@ -3211,4 +3981,5 @@
 #: ../josm/src/org/openstreetmap/josm/Main.java:413
 #: ../trunk/src/org/openstreetmap/josm/Main.java:413
+#: ../trunk.old/src/org/openstreetmap/josm/Main.java:413
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
