Index: utils/josm/plugins/lang-de/build.xml
===================================================================
--- utils/josm/plugins/lang-de/build.xml	(revision 1467)
+++ utils/josm/plugins/lang-de/build.xml	(revision 1469)
@@ -2,9 +2,16 @@
 
 	<property name="language" value="de" />
-	<property name="josm" value="../../../../editors/josm" />
+
+	<target name="init">
+	    <mkdir dir="bin" />
+	</target>
+
+	<target name="compile" depends="init">
+		<javac srcdir="src" classpath="../../../../editors/josm/dist/josm-custom.jar" destdir="bin" />
+	</target>
 	
-	<target name="install">
+	<!-- install entry point for eclipse user -->
+	<target name="jar">
 		<jar destfile="${user.home}/.josm/plugins/lang-${language}.jar" basedir="bin">
-			<fileset dir="ressource" />
 			<manifest>
 				<attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
@@ -14,17 +21,30 @@
 		</jar>
 	</target>
+	
+	<target name="install" depends="compile,gettext,jar" />
 
-	<target name="gettext">
-		<exec executable="find" output="build/alljava.txt">
-			<arg line="src -name '*.java'"/>
+
+
+	<target name="find">
+		<exec executable="find" output="alljava.txt">
+			<arg line="../../../../editors/josm/src ../ -name '*.java'"/>
 		</exec>
+	</target>
+	
+	<target name="xgettext">
 		<exec executable="xgettext">
-			<arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava -opo/keys.pot -fbuild/alljava.txt"/>
+			<arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava -okeys.pot -falljava.txt"/>
 		</exec>
+	</target>
+
+	<target name="msgmerge">
 		<exec executable="msgmerge">
-			<arg line="-U ${language}.po $(josm)/po/keys.pot"/>
+			<arg line="-U ${language}.po keys.pot"/>
 		</exec>
+	</target>
+
+	<target name="gettext" depends="find,xgettext,msgmerge">
 		<exec executable="msgfmt">
-			<arg line="--java2 -dpo -rorg.openstreetmap.josm.Translation -l${language} ${language}.po"/>
+			<arg line="--java2 -dbin -rorg.openstreetmap.josm.Translation -l${language} ${language}.po"/>
 		</exec>
 	</target>
Index: utils/josm/plugins/lang-de/de.po
===================================================================
--- utils/josm/plugins/lang-de/de.po	(revision 1467)
+++ utils/josm/plugins/lang-de/de.po	(revision 1469)
@@ -6,5 +6,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-07 17:02+0200\n"
+"POT-Creation-Date: 2006-10-13 23:04+0200\n"
 "PO-Revision-Date: 2006-09-10 14:21+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -16,104 +16,104 @@
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
 msgid "Add segment"
 msgstr "Abschnitt hinzufügen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
 msgid "Add a segment between two nodes."
 msgstr "Abschnitt zwischen zwei Knotenpunkten hinzufügen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:391
-#: src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
 msgid "Delete nodes, streets or segments."
 msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
 msgid "Cannot delete node."
 msgstr "Kann den Knotenpunkt nicht löschen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
 msgid "This object is in use."
 msgstr "Das Objekt wird benutzt."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
 msgid "Used by more than two segments."
 msgstr "Wird bei mehr als zwei Abschnitten benutzt."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
 msgid "Used by only one segment."
 msgstr "Wird bei einen Abschnitt benutzt."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
 msgid "Wrong direction of segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Schlüsselkonflikt"
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
 msgid "Segments are part of different ways."
 msgstr "Abschnitte gehören zu verschiedenen Wegen."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
 msgid "Delete Node"
 msgstr "Knotenpunkt löschen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
 msgstr "Zoomen durch anklicken  (Strg-Hoch,Links,Runter,Rechts,+,-)"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Auswahl"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects by dragging or clicking."
 msgstr "Wähle Objekte durch ziehen oder klicken."
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Verbundene Linie"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Select objects in a straight line."
 msgstr "Wähle Objekte in einer Reihe."
 
-#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
 msgid "Move around objects that are under the mouse or selected."
 msgstr ""
 
-#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Weg hinzufügen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add a new way to the data."
 msgstr "Füge einen neuen Weg hinzu."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
 msgid ""
 "Warning: This way is incomplete. Try to download it, before adding segments."
@@ -122,5 +122,5 @@
 "werden, bevor Abschnitte hinzugefügt werden."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -139,26 +139,26 @@
 "Sollen alle Abschnitte zu dem Wegen hinzugefügt werden?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Abschnitte eines Weges hinzufügen."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Do you want to add all other selected segments to the one selected way?"
 msgstr ""
 "Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Abschnitte zum Weg hinzufügen?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Alle Abschnitte neu anordnen?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Neu Anordnen?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -167,98 +167,180 @@
 msgstr[1] "Soll ein neuer Weg aus {0} Abschnitten erstellt weden."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 msgid "Create new way"
 msgstr "Neuen Weg erstellen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add a new node to the map"
 msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
 msgid "Add node into segment"
 msgstr "Knotenpunkt in einen Abschnitt einfügen"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
 msgid "Add a node into an existing segment"
 msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
 msgid "Can not add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
 msgid "Add Node into Segment"
 msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
+#, fuzzy
+msgid "Raw GPS data"
+msgstr "Hole GPS-Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr "Hole GPS-Daten"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
+#, fuzzy
+msgid "OpenStreetMap data"
+msgstr "Java OpenStreetMap - Editor "
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
+#: ../landsat/src/landsat/DownloadLandsatTask.java:21
+msgid "Downloading data"
+msgstr "Lade Daten aus dem Internet"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr "Keine Daten importiert."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
+msgid "Data Layer"
+msgstr "Daten-Ebene"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 msgid "Reverse Segments"
 msgstr "Richtung ändern"
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 msgid "Revert the direction of all selected Segments."
 msgstr "Richtung der ausgewählten Abschnitte umdrehen."
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
 msgid "Please select at least one segment."
 msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
 
-#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:217
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
 msgid "Open a preferences page for global settings."
 msgstr "öffnete eine Globale Einstellungs-Seite."
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr "Datei öffnen."
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
 msgid "CSV Data import for non-GPS data is not implemented yet."
 msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:76
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
 #, java-format
 msgid "Unknown file extension: {0}"
 msgstr "Dateiendung unbekannt: {0}"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:83
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Parsen. {0}"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:86
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen."
 
-#: src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
+#, java-format
+msgid "Executing {0}"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
+msgid "The Tool requires some data to be loaded."
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
+#, fuzzy, java-format
+msgid "Could not execute command: {0}"
+msgstr "Kann \"{0}\" nicht lesen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
+msgid "Tools"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
+#, fuzzy
+msgid "Could not read external tool configuration."
+msgstr "Kann das Format nicht ermitteln."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+msgid "Align Nodes in Circle"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#, fuzzy
+msgid "Move the selected nodes into a circle."
+msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+#, fuzzy
+msgid "Please select at least four nodes."
+msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+msgid "Rename layer"
+msgstr "Ebene umbenennen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr "Auch die Datei umbenennen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Kann die Datei \"{0}\" nicht umbenennen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download from OSM"
 msgstr "Von OSM laden"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM Server laden"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
 msgid ""
 "Move and zoom the image like the main map. Select an area to download by "
@@ -268,156 +350,156 @@
 "ladenden Bereich durch einfügen."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:105
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
 msgid "Bounding box"
 msgstr "Zeichen-Box"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
 msgid "min lat"
 msgstr "min Breite"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:108
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
 msgid "min lon"
 msgstr "min Länge"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:110
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
 msgid "max lat"
 msgstr "max Breite"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:112
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
 msgid "max lon"
 msgstr "max Länge"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
 #, fuzzy
 msgid "Download the following data:"
 msgstr "Lade Daten aus dem Internet"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:129
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
 msgid "URL from www.openstreetmap.org"
 msgstr "URL von www.openstreetmap.org"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:182
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
-#: src/org/openstreetmap/josm/command/AddCommand.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:203
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
 msgid "Please enter the desired coordinates first."
 msgstr "Bitte wählen Sie zuerst die Koordinaten."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:206
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
 msgid "Please enter a name for the location."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:219
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie ein Lesezeichen."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:238
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
 msgid "Choose an area"
 msgstr "Bereich auswählen"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:261
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
 msgid "Please enter the desired coordinates or click on a bookmark."
 msgstr ""
 "Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:263
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
 #, fuzzy
 msgid "Please select at least one download data type."
 msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr "Beende das Programm."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "Über"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java  Version {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Webseite"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Fehler melden:"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
 #, fuzzy
 msgid "News about JOSM"
 msgstr "Über JOSM..."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Version"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Mitwirkung"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:85
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "The document contains no data. Save anyway?"
 msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -427,39 +509,39 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert. Überschreiben?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "Daten"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "Auswahl"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr "Ebene"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: src/org/openstreetmap/josm/data/Preferences.java:141
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141
 msgid "conflict"
 msgstr "Konflikt"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
 #, java-format
 msgid "Auto Scale: {0}"
 msgstr "Automatisch skalieren: {0}"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
 #, java-format
 msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
@@ -468,65 +550,74 @@
 "bewegt wird)"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save as"
+msgstr "Speichern als"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save the current data to a new file."
+msgstr "Speichere die aktuellen Daten als neue Datei."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Dateien (.osm .xml)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "GPX Dateien (.gpx)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Dateien (.csv .txt)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Zum OSM speichern"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload all changes to the OSM server."
 msgstr "Kartendaten zum OSM Server speichern"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:41
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Kann nichts hoch-laden."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Es gibt ungelöste Konflikte, die zuerst bearbeitet werden müssen."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Sende Daten"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:97
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
 msgid "No changes to upload."
 msgstr "Kann keine Änderungen speichern."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:129
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
 msgid "Upload this changes?"
 msgstr "Diese Änderungen vornehmen?"
 
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "OSM Server Dateien (.osm .xml)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "GPX Dateien (.gpx)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "CSV Dateien (.csv .txt)"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Wiederherstellen"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Wiederhole die letzte zurückgenommene Aktion."
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:52
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
 #, java-format
 msgid "Downloading {0} segment"
@@ -535,202 +626,124 @@
 msgstr[1] "Hole {0} Abschnitte"
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Keine Daten importiert."
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr "Daten-Ebene"
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
 msgid "Download incomplete objects"
 msgstr "Unvollständige Objekte nachladen?"
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr "Alle (ausgewählten) unvollständigen Wege vom OSM Server laden."
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
-#, java-format
-msgid "Download {0} ways containing a total of {1} segments?"
-msgstr "Lade {0} Wege, die aus {1} Abschnitten bestehen?"
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
+#, fuzzy
+msgid "Please select an incomplete way."
+msgstr "Bitte eine Farbe wählen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#, fuzzy, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Unvollständige Objekte nachladen?"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
 msgid "Download?"
 msgstr "Daten laden?"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Wiederherstellen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Wiederhole die letzte zurückgenommene Aktion."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+msgid ""
+"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
+"GPL  stehen hoch-spielen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "In GPX exportieren"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Die Daten ins GPX-Format exportieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "GPS Track-Beschreibung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Information zum Autor hinzufügen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Voller Name"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Vordefiniert"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Jahr des Copyrights"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Export-Einstellungen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Fehler beim exportieren von. {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+msgid "Error"
+msgstr "Fehler"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Wähle eine vordefinierte Lizenz"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save"
 msgstr "Speichern"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save the current data."
 msgstr "Speichere die aktuellen Daten."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:58
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
 msgid "CSV output not supported yet."
 msgstr "CSV Ausgabe ist noch nicht möglich."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
 msgid "An error occoured while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:40
-msgid ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Achtung: Die GPL ist nicht konform zur OSM-Lizenz. Keine Tracks die unter "
-"GPL  stehen hoch-spielen."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "In GPX exportieren"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Die Daten ins GPX-Format exportieren."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "GPS Track-Beschreibung"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Information zum Autor hinzufügen."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Voller Name"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "E-Mail"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Copyright (URL)"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Vordefiniert"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Jahr des Copyrights"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Schlüsselwörter"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Export-Einstellungen"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Fehler beim exportieren von. {0}"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Fehler"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Wähle eine vordefinierte Lizenz"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-#, fuzzy
-msgid "OpenStreetMap data"
-msgstr "Java OpenStreetMap - Editor "
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-msgid "Downloading data"
-msgstr "Lade Daten aus dem Internet"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
-msgid "Raw GPS data"
-msgstr "Hole GPS-Daten"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Hole GPS-Daten"
-
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, fuzzy, java-format
-msgid "Could not execute command: {0}"
-msgstr "Kann \"{0}\" nicht lesen."
-
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-#, fuzzy
-msgid "Could not read external tool configuration."
-msgstr "Kann das Format nicht ermitteln."
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
-msgid "Align Nodes in Circle"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#, fuzzy
-msgid "Move the selected nodes into a circle."
-msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
-msgid "Please select at least four nodes."
-msgstr "Bitte wählen Sie mindestens einen Abschnitt aus."
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr "Ebene umbenennen"
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr "Auch die Datei umbenennen"
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Kann die Datei \"{0}\" nicht umbenennen."
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr "Speichern als"
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr "Speichere die aktuellen Daten als neue Datei."
-
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #, java-format
 msgid ""
@@ -740,13 +753,13 @@
 msgstr ""
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr "Nichts tun"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr "Fehler melden"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occoured.\n"
@@ -761,9 +774,9 @@
 "uns den Fehler als \"Bug Report\"."
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr "Unerwarteter Fehler"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 msgid ""
 "Please send this to josm@eigenheimstrasse.de\n"
@@ -773,5 +786,5 @@
 "\n"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
 msgid ""
 "Please send an email with the following information to josm@eigenheimstrasse."
@@ -781,87 +794,61 @@
 "josm@eigenheimstrasse.de"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr "Strg-"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
 msgid "Alt-"
 msgstr "Alt-"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
 msgid "AltGr-"
 msgstr "AltGr-"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
 msgid "Shift-"
 msgstr "Shift-"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#, fuzzy, java-format
+msgid "An error occoured in plugin {0}"
+msgstr "Beim Speichern ist ein Fehler aufgetreten."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Lade Auswahl"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr "Verbinde zu {0} ..."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Lade Daten ..."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Kann die URL \"{0}\" nicht lesen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Kann die URL \"{0}\" nicht parsen."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Open a selection list window."
 msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-msgid "Select"
-msgstr "Wähle aus"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-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."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Neu Laden"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
-msgid "Refresh the selection list."
-msgstr "Auswahlliste aktualisieren."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
-msgid "Search"
-msgstr "Suche"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search for objects."
-msgstr "Objekte suchen."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
 msgid "Please enter a search string."
 msgstr "Bitte geben Sie einen Suchbegriff ein."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -879,82 +866,111 @@
 "html>"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
+msgid "Search"
+msgstr "Suche"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr "Konflikte lösen."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr "Lösen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 "Öffnet eine Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid "Select"
+msgstr "Wähle aus"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Setze die gewählten Elemente auf der Karte auf die obige Liste der "
+"ausgewählten Objekte."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
 msgid "Please select something from the conflict list."
 msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve Conflicts"
 msgstr "Konflikte entfernen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
+msgid "Click Reload to refresh list"
+msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr "Neu Laden"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Revert"
+msgstr "Zücknehmen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr "Geschichte"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+msgid "Object"
+msgstr "Objekt"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr "Datum"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
+msgid "Not implemented yet."
+msgstr "Noch nicht fertig."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
+"zurückführen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Befehlsliste"
 
-#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
 
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
-msgid "Delete the selected layer."
-msgstr "Ausgewählte Ebene löschen."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
-msgid "Show/Hide"
-msgstr "Zeigen/Verstecken"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Toggle visible state of the selected layer."
-msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Layers"
-msgstr "Ebenen"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Open a list of all loaded layers."
-msgstr "Öffnet eine Liste alle geladenen Ebenen."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
-msgid "Move the selected layer one row up."
-msgstr "Gewählte Ebene eine Reihe höher schieben"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
-msgid "Move the selected layer one row down."
-msgstr "Gewählte Ebene eine Reihe tiefer schieben."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
-
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
 msgid "Please select the objects you want to change properties for."
 msgstr ""
@@ -962,6 +978,6 @@
 "sollen."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 #, java-format
 msgid "This will change {0} object."
@@ -970,5 +986,5 @@
 msgstr[1] "Dies wird {0} Objekte ändern."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
 msgid ""
@@ -978,47 +994,47 @@
 "Eintrag.)"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
 msgid "Change values?"
 msgstr "Wert ändern?"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
 msgid "<different>"
 msgstr "<verschieden>"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "Please select objects for which you want to change properties."
 msgstr ""
 "Bitte die Objekte auswählen an denen Eigenschaften geändert werden sollen."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Properties"
 msgstr "Einstellungen"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Property for selected objects."
 msgstr "Einstellungen der Ausgewählten Objekte."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
 #, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Parsen. {0}"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
 #, java-format
 msgid "Change {0} object"
@@ -1027,88 +1043,112 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Schlüssel"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Wert"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "Please select the row to edit."
 msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die löschende Zeile."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
 msgid "Add a new key/value pair to all objects"
 msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:376
-#: src/org/openstreetmap/josm/Main.java:218
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte ändern"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
 msgid "Delete the selected key in all objects"
 msgstr "Den Schlüssel aus allen Objekten löschen."
 
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Zücknehmen"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Geschichte"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: src/org/openstreetmap/josm/gui/MapStatus.java:224
-msgid "Object"
-msgstr "Objekt"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Datum"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178
-msgid "Not implemented yet."
-msgstr "Noch nicht fertig."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-"Die ausgewählten Objekte in die gewählten Version in der Versionsliste "
-"zurückführen."
-
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: src/org/openstreetmap/josm/data/Preferences.java:135
-#: src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
+msgid "Delete the selected layer."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+msgid "Show/Hide"
+msgstr "Zeigen/Verstecken"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+msgid "Toggle visible state of the selected layer."
+msgstr "Schaltet die Ebene zwischen sichtbar und unsichtbar um."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Layers"
+msgstr "Ebenen"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Open a list of all loaded layers."
+msgstr "Öffnet eine Liste alle geladenen Ebenen."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+msgid "Move the selected layer one row up."
+msgstr "Gewählte Ebene eine Reihe höher schieben"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+msgid "Move the selected layer one row down."
+msgstr "Gewählte Ebene eine Reihe tiefer schieben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unbekannter Typ in Zeile {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
+#, java-format
+msgid ""
+"display_values ({0}) and values ({1}) must be of same number of elements."
+msgstr ""
+"display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
+"haben."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "Element"
+msgstr[1] "Elemente"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Einstellungen ändern"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
 msgid "node"
 msgid_plural "nodes"
@@ -1116,7 +1156,7 @@
 msgstr[1] "Knotenpunkte"
 
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: src/org/openstreetmap/josm/data/Preferences.java:136
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:136
 msgid "segment"
 msgid_plural "segments"
@@ -1124,7 +1164,7 @@
 msgstr[1] "Abschnitte"
 
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: src/org/openstreetmap/josm/data/Preferences.java:137
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:137
 msgid "way"
 msgid_plural "ways"
@@ -1132,23 +1172,23 @@
 msgstr[1] "Wege"
 
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "There were conflicts during import."
 msgstr "Es gab Konflikte beim Importieren.w"
 
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
 #, java-format
 msgid " ({0} deleted.)"
 msgstr "({0} gelöscht)"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "track"
 msgid_plural "tracks"
@@ -1156,5 +1196,5 @@
 msgstr[1] "Tracks"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -1162,5 +1202,5 @@
 msgstr[1] "Punkte"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #, java-format
 msgid "a track with {0} point"
@@ -1169,5 +1209,5 @@
 msgstr[1] "Ein Track mit {0} Punkten"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1176,5 +1216,5 @@
 msgstr[1] "{0} besteht aus {1} Tracks"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} point"
@@ -1183,106 +1223,106 @@
 msgstr[1] "{0} Punkte"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 msgid "Customize line drawing"
 msgstr "Linen aussehen anpassen"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Use global settings."
 msgstr "Globale Einstellungen benutzen."
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Draw lines between points for this layer."
 msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
 msgid "Select line drawing options"
 msgstr "Wähle die Zeichen-Einstellungen"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "OK"
 msgstr "Okay"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG Bilder (*.jpg)"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder für {0}"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Lese GPS..."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Kein Zeit für Punkt {0} x {1}"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lese {0} ...."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr "Bilder mit Ortsbezug"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS Start: {0}"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Ende: {0}"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Momentaner Unterschied {0}s"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1290,131 +1330,131 @@
 msgstr[1] "Bilder"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innerhalb des Tracks."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Uhrzeit Synchronisieren"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Die Datei {0} kann nicht verarbeitet werden."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Bild"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr "Zeit mit GPS Gerät synchronisieren"
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
 msgid "Could not read bookmarks."
 msgstr "Kann Lesezeichen nicht lesen."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:98
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
 msgid "Could not write bookmark."
 msgstr "Kann Lesezeichen nicht schreiben."
 
-#: src/org/openstreetmap/josm/gui/MapView.java:123
-#: src/org/openstreetmap/josm/gui/MainApplication.java:172
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Java Open Street Map - Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: src/org/openstreetmap/josm/gui/MapView.java:163
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:53
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:55
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
 msgid "There are unsaved changes. Really quit?"
 msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
 msgid "Unsaved Changes"
 msgstr "Daten nicht gespeichert"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "usage"
 msgstr "Benutzung"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "options"
 msgstr "Optionen"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Show this help"
 msgstr "Zeige diese Hilfe"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Download the bounding box"
 msgstr "Lade den Zeichen-Kasten"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:152
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:154
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Download the bounding box as raw gps"
 msgstr "Lade den Zeichen-Kasten als Roh-GPS"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:155
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid "Select with the given search"
 msgstr "Auswählen mit der angegebenen Suche"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Don't launch in fullscreen mode"
 msgstr "Nicht im Vollbildmodus starten"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Set the language. Example: "
 msgstr "Die Sprache Einstellen. Beispiel:"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "examples"
 msgstr "Beispiele"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -1425,13 +1465,29 @@
 "selection verwendet wird."
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
 
-#: src/org/openstreetmap/josm/gui/MapStatus.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
+msgid "Layer"
+msgstr "Ebene"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
+msgid "Files"
+msgstr "Dateien"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
+msgid "Connection"
+msgstr "Verbindung"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+msgid "Contacting the OSM server..."
+msgstr "Versuche OSM Server zu erreichen...."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
 msgid "Lat/Lon"
 msgstr "Breite/Länge"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1440,49 +1496,49 @@
 msgstr[1] "{0} Objekte haben Konflikte:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr "meine Version:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr "deren Version:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr "neue Version:"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
 msgid "Error while parsing"
 msgstr "Fehler beim Parsen"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
 msgid "File Not found"
 msgstr "Datei wurde nicht gefunden."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "string"
 msgstr "Zeichenkette"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr "Name des Benutzers."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr "OSM Passwort."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Ändere die Größe auf den angegeben Wert (Format: Breitex Höhe)"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "string;string;..."
 msgstr "Zeichenkette;Zeichenkette;..."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
@@ -1492,5 +1548,5 @@
 "Dateiname sein."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
@@ -1500,5 +1556,5 @@
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -1508,45 +1564,45 @@
 "Suchanfrage oder eine URL  auf ein osm-xml Dokument sein."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr "jeder"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: src/org/openstreetmap/josm/io/OsmConnection.java:68
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: src/org/openstreetmap/josm/io/OsmConnection.java:71
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
 msgid "Password"
 msgstr "Passwort"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:125
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 "Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:193
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
 msgid "Draw lines between raw gps points."
 msgstr "Zeichne Linien zwischen Roh GPS Punkten."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:197
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
 msgid "Force lines if no segments imported."
 msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
 msgid "Draw large GPS points."
 msgstr "Zeichne große GPS Punkte."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
 msgid "Draw Direction Arrows"
 msgstr "Zeichne Richtungspfeile"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:273
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1555,47 +1611,47 @@
 "Informationen enthalten."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
 msgid "Draw larger dots for the GPS points."
 msgstr "Zeichnet größere Punkte für GPS-Punkte."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid "Draw direction hints for all segments."
 msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 msgid "Color"
 msgstr "Farbe"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
 msgid "Name"
 msgstr "Name"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select a color."
 msgstr "Bitte eine Farbe wählen."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Eine Farbe für {0} auswählen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid "Annotation preset source"
 msgstr "Voreinstellungsquelle"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
 msgid "The base URL to the OSM server (REST API)"
 msgstr "Die Basis URL des OSM Servers (REST API)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
 msgid "Login name (email) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM Server."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:409
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1604,9 +1660,9 @@
 "werden soll."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:410
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "Die Basis URL für WMS Hintergrund-Bilder."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:411
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1625,5 +1681,5 @@
 "ließt einfach die Länge und Breite durch Komma getrennt.</html>"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1633,9 +1689,9 @@
 "werden um die Linien entlang des Weges zu vervollständigen."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:420
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1645,17 +1701,17 @@
 "josm.eigenheimstrasse.de/wiki/AnnotationPresets für Hilfe."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Add a new annotation preset source to the list."
 msgstr "Eine neue Voreinstellungsdatei zu der Liste hinzufügen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle löschen."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1664,37 +1720,33 @@
 "Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431
-msgid "Language"
-msgstr "Sprache"
-
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Colors"
 msgstr "Farben"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Connection Settings to the OSM server."
 msgstr "Verbinungseinstellungen des OSM Servers."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Base Server URL"
 msgstr "Basis Rechner URL"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:448
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
 msgid "OSM username (email)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
 msgid "OSM password"
 msgstr "OSM Passwort"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:452
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1706,146 +1758,108 @@
 "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:461
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV Import Definition (leer: lese aus der ersten Zeile der Daten)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
 msgid "Projection method"
 msgstr "Projektionsmethode"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Annotation preset sources"
 msgstr "Voreinstellungs-Quellen:"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Plugins"
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
 msgid "Configure available Plugins."
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unbekannter Typ in Zeile {0}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr "Kann keine schreibbare Combobox mit Defaultwerten haben (Zeile {0})"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
-#, java-format
-msgid ""
-"display_values ({0}) and values ({1}) must be of same number of elements."
-msgstr ""
-"display_values ({0}) und values ({1}) müssen die selbe Anzahl an Elementen "
-"haben."
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "Element"
-msgstr[1] "Elemente"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
-
-#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
-msgid "Contacting the OSM server..."
-msgstr "Versuche OSM Server zu erreichen...."
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41
-msgid "Conflicts in disjunct objects"
-msgstr "Konflikte in unabhängigen Objekten"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59
-#, java-format
-msgid "Downloading {0} {1}"
-msgstr "Hole {0} {1}"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66
-msgid "Got more than one object when expecting only one."
-msgstr "Habe ein Objekt erwartet, aber mehrere empfangen."
-
-#: src/org/openstreetmap/josm/io/OsmReader.java:96
-#: src/org/openstreetmap/josm/io/OsmReader.java:98
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
+msgid "Get more plugins"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Lade Punkte {0} bis {1}..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
+msgid "Downloading OSM data..."
+msgstr "Hole OSM-Daten...."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
 msgid "Unknown version"
 msgstr "Version unbekannt."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
 msgid "Found <seg> tag on non-way."
 msgstr "<seg>-Tag auf einen Nicht-Weg gefunden."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:117
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
 msgid "Incomplete segment with id=0"
 msgstr "Unvollständiger Abschnitt mit id=0"
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:126
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
 msgid "NullPointerException. Possible some missing tags."
 msgstr "NullPointerException. Vielleicht fehlende Tags."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:141
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:149
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
 #, java-format
 msgid "Couldn''t read time format \"{0}\"."
 msgstr "Kann das Zeit-Format \"{0}\" nicht lesen."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:164
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
 #, java-format
 msgid "Missing required attirbute \"{0}\"."
 msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
 msgid "Preparing data..."
 msgstr "Breite Daten vor ...."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
 msgid "Illformed Node id"
 msgstr "Kranken Knotenpunkt Id"
 
-#: src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
 #, java-format
 msgid "Upload {0} {1} ({2})..."
 msgstr "Überspiele {0} {1} ({2})..."
 
-#: src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
 msgid "Unknown host"
 msgstr "Rechner unbekannt."
 
-#: src/org/openstreetmap/josm/io/RawGpsReader.java:43
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr "Daten Fehler: lat Wert \"{0}\" hat eine Grenze überschritten."
 
-#: src/org/openstreetmap/josm/io/RawGpsReader.java:45
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr "Daten Fehler: lon Wert \"{0}\" hat eine Grenze überschritten."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
 msgid "Could not detect data format string."
 msgstr "Kann das Format nicht ermitteln."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
 msgid ""
 "Format string in data is incomplete or not found. Try setting an manual "
@@ -1855,5 +1869,5 @@
 "Versuchen sie das Format in den Einstellungen einzustellen."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
 msgid ""
 "Format string is incomplete. Need at least 'lat' and 'lon' specification"
@@ -1862,96 +1876,97 @@
 "Spalten."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
 #, java-format
 msgid "Unknown data type: \"{0}\"."
 msgstr "Unbekannter Datentyp \"{0}\"."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
 msgid "Maybe add an format string in preferences."
 msgstr "Vielleicht sollte das Format in den Einstellungen festgelegt werden."
 
-#: src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
 #, java-format
 msgid "Parsing error in line {0}"
 msgstr "Fehler beim parsen der Zeile {0}"
 
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Lade Punkte {0} bis {1}..."
-
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Hole OSM-Daten...."
-
-#: src/org/openstreetmap/josm/io/OsmConnection.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:116
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
 msgid "Aborting..."
 msgstr "Abbruch..."
 
-#: src/org/openstreetmap/josm/io/OsmIdReader.java:34
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
+#, java-format
+msgid "Data error: Segment {0} is deleted but part of Way {1}"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
+#, java-format
+msgid "Data error: Node {0} is deleted but part of Segment {1}"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
 msgid "Error during parse."
 msgstr "Fehler beim parsen."
 
-#: src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
 msgid "position"
 msgstr "Position"
 
-#: src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
 msgid "different"
 msgstr "verschieden"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr "gelöscht"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr "wahr"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr "falsch"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr "nichts"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr "Abschnitte"
 
-#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr "bis"
 
-#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr "von"
 
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "new"
 msgstr "neu"
 
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
 #, java-format
 msgid "{0} node"
@@ -1960,52 +1975,52 @@
 msgstr[1] "{0} Knotenpunkte"
 
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:134
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "background"
 msgstr "Hintergrund"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:138
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "incomplete way"
 msgstr "unvollständiger Weg"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:139
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "selected"
 msgstr "gewählt"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:140
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
 msgid "gps point"
 msgstr "GPS Punkt"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:142
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
 msgstr "Skala"
 
-#: src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
 msgstr "Löse {0} Konflikte in {1} Objekten"
 
-#: src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr "Ändere"
 
-#: src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr "Abfolge"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Remove \"{0}\" for"
 msgstr "Entferne \"{0}\" für"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Set {0}={1} for"
 msgstr "Setze {0}={1} für"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -2013,50 +2028,19 @@
 msgstr[1] "Objekte"
 
-#: src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "Beim Speichern ist ein Fehler aufgetreten."
-
-#: src/org/openstreetmap/josm/Main.java:176
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
-"werden."
-
-#: src/org/openstreetmap/josm/Main.java:183
-msgid "Annotation Preset Tester"
-msgstr "Voreinstellungsquellen Tester"
-
-#: src/org/openstreetmap/josm/Main.java:195
-msgid "Files"
-msgstr "Dateien"
-
-#: src/org/openstreetmap/josm/Main.java:206
-msgid "Connection"
-msgstr "Verbindung"
-
-#: src/org/openstreetmap/josm/Main.java:213
-msgid "Layer"
-msgstr "Ebene"
-
-#: src/org/openstreetmap/josm/Main.java:234
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/org/openstreetmap/josm/Main.java:267
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr ""
 
-#: src/org/openstreetmap/josm/Main.java:270
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204
 #, fuzzy, java-format
 msgid "Could not load plugin {0}."
 msgstr "Kann \"{0}\" nicht lesen."
 
-#: src/org/openstreetmap/josm/Main.java:293
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: src/org/openstreetmap/josm/Main.java:343
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -2064,14 +2048,73 @@
 "RPSG:4263."
 
-#: src/org/openstreetmap/josm/Main.java:401
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: src/org/openstreetmap/josm/Main.java:413
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
 msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
 
+#: ../osmarender/src/OsmarenderPlugin.java:102
+#: ../osmarender/src/OsmarenderPlugin.java:108
+msgid "View"
+msgstr ""
+
+#: ../landsat/src/landsat/DownloadLandsatTask.java:18
+#, fuzzy
+msgid "Landsat background images"
+msgstr "Lade und zeige Satelietenbilder als Hintergrund."
+
+#: ../landsat/src/landsat/LandsatLayer.java:45
+#, fuzzy
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
+"operieren."
+
+#: ../landsat/src/landsat/LandsatLayer.java:70
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "WMS-Ebene: {0}"
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid "Annotation Preset Tester"
+msgstr "Voreinstellungsquellen Tester"
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid ""
+"Open the annotation preset test tool for previewing annotation preset "
+"dialogs."
+msgstr ""
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:28
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+"Es müssen zuerst Voreinstellungsquellen in den Einstellungen definiert "
+"werden."
+
+#~ msgid "Download {0} ways containing a total of {1} segments?"
+#~ msgstr "Lade {0} Wege, die aus {1} Abschnitten bestehen?"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Auswahlliste aktualisieren."
+
+#~ msgid "Search for objects."
+#~ msgstr "Objekte suchen."
+
+#~ msgid "Language"
+#~ msgstr "Sprache"
+
+#~ msgid "Conflicts in disjunct objects"
+#~ msgstr "Konflikte in unabhängigen Objekten"
+
+#~ msgid "Downloading {0} {1}"
+#~ msgstr "Hole {0} {1}"
+
+#~ msgid "Got more than one object when expecting only one."
+#~ msgstr "Habe ein Objekt erwartet, aber mehrere empfangen."
+
 #~ msgid "Move selected objects around."
 #~ msgstr "Verschiebe markierte Objekte"
@@ -2082,13 +2125,2 @@
 #~ msgid "Show background"
 #~ msgstr "Hintergrund anzeigen"
-
-#~ msgid "Download and show landsat background images."
-#~ msgstr "Lade und zeige Satelietenbilder als Hintergrund."
-
-#~ msgid "Wrong longitude transformation for tile cache. Can't operate on {0}"
-#~ msgstr ""
-#~ "Falsche Breitentransformation für den Teilen-Cache. Kann nicht auf {0} "
-#~ "operieren."
-
-#~ msgid "WMS layer: {0}"
-#~ msgstr "WMS-Ebene: {0}"
