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}"
Index: utils/josm/plugins/lang-en_GB/build.xml
===================================================================
--- utils/josm/plugins/lang-en_GB/build.xml	(revision 1467)
+++ utils/josm/plugins/lang-en_GB/build.xml	(revision 1469)
@@ -2,9 +2,16 @@
 
 	<property name="language" value="en_GB" />
-	<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-en_GB/en_GB.po
===================================================================
--- utils/josm/plugins/lang-en_GB/en_GB.po	(revision 1467)
+++ utils/josm/plugins/lang-en_GB/en_GB.po	(revision 1469)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-07 17:02+0200\n"
+"POT-Creation-Date: 2006-10-13 23:16+0200\n"
 "PO-Revision-Date: 2006-07-22 16:18+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -20,104 +20,104 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\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 "Add segment"
 
-#: 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 "Add a segment between two nodes."
 
-#: 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 "Delete"
 
-#: 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 "Delete nodes, streets or segments."
 
-#: 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 "Cannot delete node."
 
-#: 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 "This object is in use."
 
-#: 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 "Used by more than two segments."
 
-#: 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 "Used by only one segment."
 
-#: 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 "Wrong direction of segments."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Conflicting keys"
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
 msgid "Delete Node"
 msgstr "Delete Node"
 
-#: 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 "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Selection"
 
-#: 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 "Select objects by dragging or clicking."
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Straight line"
 
-#: 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 "Select objects in a straight line."
 
-#: 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 "Move"
 
-#: 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 "Cannot move objects outside of the world."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Add Way"
 
-#: 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 "Add a new way to the data."
 
-#: 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."
@@ -125,5 +125,5 @@
 "Warning: This way is incomplete. Try to download it before adding segments."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, fuzzy, java-format
 msgid ""
@@ -144,26 +144,26 @@
 "Do you wish to select all segments belonging to the ways instead?"
 
-#: 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 "Add segments from ways"
 
-#: 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 ""
 "Do you want to add all other selected segments to the one selected way?"
 
-#: 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 "Add segments to way?"
 
-#: 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 "Reorder all line segments?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Reorder?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 #, fuzzy, java-format
 msgid "Create a new way out of {0} segment?"
@@ -172,101 +172,183 @@
 msgstr[1] "Create a new way out of {0} segment?"
 
-#: 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 "Create new way"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node"
 msgstr "Add node"
 
-#: 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 "Add a new node to the map"
 
-#: 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 "Add node into segment"
 
-#: 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 "Add a node into an existing segment"
 
-#: 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 "Can not add a node outside of the world."
 
-#: 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 "Add Node into Segment"
 
-#: 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 "Downloading GPS data"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr "Downloading GPS data"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
+#, fuzzy
+msgid "OpenStreetMap data"
+msgstr "Java Open Street Map - Editor"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
+#: ../landsat/src/landsat/DownloadLandsatTask.java:21
+msgid "Downloading data"
+msgstr "Downloading data"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr "No data imported."
+
+#: ../../../../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 "Data Layer"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 #, fuzzy
 msgid "Reverse Segments"
 msgstr "segments"
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 #, fuzzy
 msgid "Revert the direction of all selected Segments."
 msgstr "Wrong direction of segments."
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
 #, fuzzy
 msgid "Please select at least one segment."
 msgstr "Please select the row to delete."
 
-#: 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 "Preferences"
 
-#: 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 "Open a preferences page for global settings."
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Open"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr "Open a file."
 
-#: 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 Data import for non-GPS data is not implemented yet."
 
-#: 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 "Unknown file extension: {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 "Error while parsing {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 "Could not read \"{0}\""
 
-#: 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 "Could not read \"{0}\""
+
+#: ../../../../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 "Could not detect data format string."
+
+#: ../../../../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 "Merge the selected layer into the layer directly below."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+#, fuzzy
+msgid "Please select at least four nodes."
+msgstr "Please select the row to delete."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+msgid "Rename layer"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#, fuzzy, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Could not read \"{0}\""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Undo"
 
-#: src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Undo the last action."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download from OSM"
 msgstr "Download from OSM"
 
-#: 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 "Download map data from the OSM server."
 
-#: 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 "
@@ -276,156 +358,156 @@
 "dragging."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:105
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
 msgid "Bounding box"
 msgstr "Bounding box"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
 msgid "min lat"
 msgstr "min lat"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:108
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
 msgid "min lon"
 msgstr "min lon"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:110
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
 msgid "max lat"
 msgstr "max lat"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:112
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
 msgid "max lon"
 msgstr "max lon"
 
-#: 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 "Downloading data"
 
-#: 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 from www.openstreetmap.org"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:182
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: 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 "Add"
 
-#: 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 "Please enter the desired coordinates first."
 
-#: 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 "Please enter a name for the location."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
 msgid "Remove"
 msgstr "Remove"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:219
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
 msgid "Select a bookmark first."
 msgstr "Select a bookmark first."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:238
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
 msgid "Choose an area"
 msgstr "Choose an area"
 
-#: 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 "Please enter the desired coordinates or click on a bookmark."
 
-#: 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 "Please select the row to delete."
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Exit"
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr "Exit the application."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "About"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Display the about screen."
 
-#: 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 "last change at {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
 #, fuzzy, java-format
 msgid "Java Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Bug Reports"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
 #, fuzzy
 msgid "News about JOSM"
 msgstr "About 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 "Readme"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revision"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 #, fuzzy
 msgid "Contribution"
 msgstr "Connection"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:85
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
 msgid "About JOSM..."
 msgstr "About 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 "File could not be found."
 
-#: 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 "No document open so nothing to save."
 
-#: 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 "The document contains no data. Save anyway?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "Empty document"
 msgstr "Empty document"
 
-#: 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 "
@@ -435,104 +517,115 @@
 "if you rejected all. Continue?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "File exists. Overwrite?"
 msgstr "File exists. Overwrite?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "data"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selection"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr "layer"
 
-#: 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 "conflict"
 
-#: 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 "Auto Scale: {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)"
 msgstr "Auto zoom the view (to {0}. Disabled if the view is moved)"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save as"
+msgstr "Save"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save the current data to a new file."
+msgstr "Save the current data."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Files (.osm .xml)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "GPX Files (.gpx)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Files (.csv .txt)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Upload to OSM"
 
-#: 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 "Upload all changes to the OSM server."
 
-#: 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 "Nothing to upload. Get some data first."
 
-#: 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 "There are unresolved conflicts. You have to resolve these first."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Uploading data"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:97
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
 msgid "Objects to add:"
 msgstr "Objects to add:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Objects to modify:"
 msgstr "Objects to modify:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
 msgid "Objects to delete:"
 msgstr "Objects to delete:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:129
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
 msgid "Upload this changes?"
 msgstr "Upload these changes?"
 
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "OSM Server Files (.osm .xml)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "GPX Files (.gpx)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "CSV Files (.csv .txt)"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Redo"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Redo the last undone action."
-
-#: 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 "Help"
+
+#: ../../../../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
 #, fuzzy, java-format
 msgid "Downloading {0} segment"
@@ -541,204 +634,124 @@
 msgstr[1] "Downloading {0} segments"
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "No data imported."
-
-#: 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 "Data Layer"
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
 msgid "Download incomplete objects"
 msgstr "Download incomplete objects"
 
-#: 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 "Download all (selected) incomplete ways from the OSM server."
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
-#, java-format
-msgid "Download {0} ways containing a total of {1} segments?"
-msgstr "Download {0} ways containing a total of {1} segments?"
-
-#: 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 "Please select a colour."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#, fuzzy, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Download incomplete objects"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
 msgid "Download?"
 msgstr "Download?"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Redo"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Redo the last undone action."
+
+#: ../../../../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 ""
+"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"tracks."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Export to GPX"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Export the data to GPX file."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nothing to export. Get some data first."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "gps track description"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Add author information"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Real name"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "Email"
+
+#: ../../../../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 "Predefined"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Copyright year"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Keywords"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Export options"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Error while exporting {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+msgid "Error"
+msgstr "Error"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Choose a predefined license"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save"
 msgstr "Save"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save the current data."
 msgstr "Save the current data."
 
-#: 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 output not supported yet."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
 msgid "Unknown file extension."
 msgstr "Unknown file extension."
 
-#: 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 "An error occoured while saving."
 
-#: 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 ""
-"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
-"tracks."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Export to GPX"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Export the data to GPX file."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nothing to export. Get some data first."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "gps track description"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Add author information"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Real name"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "Email"
-
-#: 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 "Predefined"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Copyright year"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Keywords"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Export options"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Error while exporting {0}"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Error"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Choose a predefined license"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-#, fuzzy
-msgid "OpenStreetMap data"
-msgstr "Java Open Street Map - Editor"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-msgid "Downloading data"
-msgstr "Downloading data"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
-msgid "Raw GPS data"
-msgstr "Downloading GPS data"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Downloading GPS data"
-
-#: 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 "Could not read \"{0}\""
-
-#: 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 "Could not detect data format string."
-
-#: 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 "Merge the selected layer into the layer directly below."
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
-msgid "Please select at least four nodes."
-msgstr "Please select the row to delete."
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, fuzzy, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Could not read \"{0}\""
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save as"
-msgstr "Save"
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save the current data to a new file."
-msgstr "Save the current data."
-
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #, java-format
 msgid ""
@@ -748,13 +761,13 @@
 msgstr ""
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr "Do nothing"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr "Report Bug"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occoured.\n"
@@ -768,9 +781,9 @@
 "version of JOSM, please consider be kind and file a bug report."
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr "Unexpected Exception"
 
-#: 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"
@@ -780,5 +793,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."
@@ -788,86 +801,61 @@
 "de"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr "Ctrl-"
 
-#: 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 "An error occoured while saving."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Load Selection"
 
-#: 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 "Contact {0}..."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: 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 "Could not read from url: \"{0}\""
 
-#: 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 "Parsing error in url: \"{0}\""
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: 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 "Open a selection list window."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-msgid "Select"
-msgstr "Select"
-
-#: 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 ""
-"Set the selected elements on the map to the selected items in the list above."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Reload"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
-msgid "Refresh the selection list."
-msgstr "Refresh the selection list."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
-msgid "Search"
-msgstr "Search"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search for objects."
-msgstr "Search for objects."
-
-#: 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 "Please enter a search string."
 
-#: 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 "
@@ -883,87 +871,114 @@
 "li><li><code>foot:</code>  - key=foot set to any value.</ul></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 "replace selection"
 
-#: 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 "add to selection"
 
-#: 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 "remove from selection"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
+msgid "Search"
+msgstr "Search"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr "Merging conflicts."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr "Resolve"
 
-#: 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 "Open a merge dialog of all selected items in the list above."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid "Select"
+msgstr "Select"
+
+#: ../../../../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 ""
+"Set the selected elements on the map to the selected items in the list above."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
 msgid "Please select something from the conflict list."
 msgstr "Please select something from the conflict list."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve Conflicts"
 msgstr "Resolve Conflicts"
 
-#: 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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr "Reload"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+#, fuzzy
+msgid "Revert"
+msgstr "Remove"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+msgid "Object"
+msgstr "Object"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: ../../../../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 "Not implemented yet."
+
+#: ../../../../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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Command Stack"
 
-#: 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 "Open a list of all commands (undo buffer)."
 
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
-msgid "Delete the selected layer."
-msgstr "Delete the selected layer."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
-msgid "Show/Hide"
-msgstr "Show/Hide"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Layers"
-msgstr "Layers"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Open a list of all loaded layers."
-msgstr "Open a list of all loaded layers."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
-msgid "Move the selected layer one row up."
-msgstr "Move the selected layer one row up."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
-msgid "Move the selected layer one row down."
-msgstr "Move the selected layer one row down."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Merge the selected layer into the layer directly below."
-
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
 #, fuzzy
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the row to delete."
 
-#: 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
 #, fuzzy, java-format
 msgid "This will change {0} object."
@@ -972,5 +987,5 @@
 msgstr[1] "This will change {0} object."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
 msgid ""
@@ -979,46 +994,46 @@
 "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
 
-#: 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 "Change values?"
 
-#: 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 "<different>"
 
-#: 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 ""
 
-#: 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 "Please select a key"
 
-#: 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 "Please select a value"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Properties"
 msgstr "Properties"
 
-#: 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 "Properties for selected objects."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
 #, fuzzy, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Could not read from url: \"{0}\""
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
 #, fuzzy, java-format
 msgid "Error parsing {0}: "
 msgstr "Error while parsing {0}"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -1027,87 +1042,112 @@
 msgstr[1] "This will change {0} object."
 
-#: 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 "Key"
 
-#: 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 "Value"
 
-#: 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 "Please select the row to edit."
 
-#: 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 "Please select the row to delete."
 
-#: 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 "Add a new key/value pair to all objects"
 
-#: 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 "Edit"
 
-#: 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 "Edit the value of the selected key for all objects"
 
-#: 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 "Delete the selected key in all objects"
 
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-#, fuzzy
-msgid "Revert"
-msgstr "Remove"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: src/org/openstreetmap/josm/gui/MapStatus.java:224
-msgid "Object"
-msgstr "Object"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178
-msgid "Not implemented yet."
-msgstr "Not implemented yet."
-
-#: 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 ""
-
-#: 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 "Delete the selected layer."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+msgid "Show/Hide"
+msgstr "Show/Hide"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Layers"
+msgstr "Layers"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Open a list of all loaded layers."
+msgstr "Open a list of all loaded layers."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Merge the selected layer into the layer directly below."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, fuzzy, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unknown file extension: {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 ""
+
+#: ../../../../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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+#, fuzzy
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "segment"
+msgstr[1] "segment"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+#, fuzzy
+msgid "Change Properties"
+msgstr "Properties"
+
+#: ../../../../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
 #, fuzzy
 msgid "node"
@@ -1116,7 +1156,7 @@
 msgstr[1] "node"
 
-#: 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
 #, fuzzy
 msgid "segment"
@@ -1125,7 +1165,7 @@
 msgstr[1] "segment"
 
-#: 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
 #, fuzzy
 msgid "way"
@@ -1134,23 +1174,23 @@
 msgstr[1] "way"
 
-#: 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 "There were conflicts during import."
 
-#: 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} consists of:"
 
-#: 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} deleted.)"
 
-#: 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 "Convert to data layer"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #, fuzzy
 msgid "track"
@@ -1159,5 +1199,5 @@
 msgstr[1] "track"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 #, fuzzy
 msgid "point"
@@ -1166,5 +1206,5 @@
 msgstr[1] "point"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #, fuzzy, java-format
 msgid "a track with {0} point"
@@ -1173,5 +1213,5 @@
 msgstr[1] "a track with {0} point"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, fuzzy, java-format
 msgid "{0} consists of {1} track"
@@ -1180,5 +1220,5 @@
 msgstr[1] "{0} consists of {1} track"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, fuzzy, java-format
 msgid "{0} point"
@@ -1187,110 +1227,110 @@
 msgstr[1] "{0} point"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, fuzzy
 msgid "Customize line drawing"
 msgstr "Customise Colour"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 #, fuzzy
 msgid "Use global settings."
 msgstr "Display Settings"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 #, fuzzy
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between raw gps points."
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 #, fuzzy
 msgid "Do not draw lines between points for this layer."
 msgstr "Draw lines between raw gps points."
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
 msgid "Customize Color"
 msgstr "Customise Colour"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "OK"
 msgstr "OK"
 
-#: 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 "Cancel"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "Default"
 msgstr "Default"
 
-#: 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 "Choose a colour"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Import images"
 msgstr "Import images"
 
-#: 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 images (*.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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Read 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 "No time for point {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 "Cannot read time \"{0}\" from point {1} x {2}"
 
-#: 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 "No images with readable timestamps found."
 
-#: 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 "Reading {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 "Geotagged Images"
 
-#: 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 end: {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 "current delta: {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 "timezone difference: "
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, fuzzy
 msgid "image"
@@ -1299,132 +1339,132 @@
 msgstr[1] "image"
 
-#: 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} within the track."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Sync clock"
 
-#: 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 "The date in file \"{0}\" could not be parsed."
 
-#: 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 "There is no EXIF time within the file \"{0}\"."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Image"
 
-#: 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 "Enter shown date (mm/dd/yyyy 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 "GPS unit timezome (difference to photo)"
 
-#: 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 "Synchronise Time with GPS Unit"
 
-#: 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 "Time entered could not be parsed."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
 msgid "Could not read bookmarks."
 msgstr "Could not read bookmarks."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:98
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
 msgid "Could not write bookmark."
 msgstr "Could not write bookmark."
 
-#: 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 Open Street Map - 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 "layer not in list."
 
-#: 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 "Hint: Some changes came from uploading new data to the server."
 
-#: 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 "There are unsaved changes. Really quit?"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
 #, fuzzy
 msgid "Java OpenStreetMap Editor"
 msgstr "Java Open Street Map - Editor"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "usage"
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 #, fuzzy
 msgid "options"
 msgstr "Export options"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Show this help"
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Download the bounding box"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Set the language. Example: "
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "examples"
 msgstr ""
 
-#: 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"
@@ -1432,13 +1472,29 @@
 msgstr ""
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/MapStatus.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
+msgid "Layer"
+msgstr "Layer"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
+msgid "Files"
+msgstr "Files"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
+msgid "Connection"
+msgstr "Connection"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+msgid "Contacting the OSM server..."
+msgstr "Contacting the OSM server..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
 #, fuzzy, java-format
 msgid "{0} object has conflicts:"
@@ -1447,49 +1503,49 @@
 msgstr[1] "{0} object has conflicts:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr "my version:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr "their version:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr "resolved version:"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
 msgid "Error while parsing"
 msgstr "Error while parsing"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
 msgid "File Not found"
 msgstr "File Not found"
 
-#: 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 "string"
 
-#: 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 of the user."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr "OSM Password."
 
-#: 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 "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
 
-#: 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 "string;string;..."
 
-#: 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 "
@@ -1499,5 +1555,5 @@
 "filename"
 
-#: 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 "
@@ -1507,5 +1563,5 @@
 "lat=y&lon=x&zoom=z or a filename"
 
-#: 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 "
@@ -1515,43 +1571,43 @@
 "url which returns osm-xml"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr "any"
 
-#: 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 "If specified, reset the configuration instead of reading it."
 
-#: 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 "Username"
 
-#: 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 "Password"
 
-#: 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 "You have to restart JOSM for some settings to take effect."
 
-#: 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 "Draw lines between raw gps points."
 
-#: 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 "Force lines if no segments imported."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
 msgid "Draw large GPS points."
 msgstr ""
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: 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."
@@ -1559,47 +1615,47 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: 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 ""
 
-#: 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 "Draw direction hints for all segments."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 msgid "Color"
 msgstr "Colour"
 
-#: 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 "Choose"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select a color."
 msgstr "Please select a colour."
 
-#: 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 "Choose a colour for {0}"
 
-#: 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 ""
 
-#: 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 "The base URL to the OSM server (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 "Login name (email) to the OSM account."
 
-#: 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."
@@ -1607,9 +1663,9 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: 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 "The base URL to the server retrieving WMS background pictures from."
 
-#: 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</"
@@ -1627,5 +1683,5 @@
 "example: \"lat,lon\" will just read lat/lon values comma seperated.</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 "
@@ -1635,9 +1691,9 @@
 "way."
 
-#: 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 "Colours used by different objects in JOSM."
 
-#: 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,18 +1701,18 @@
 msgstr ""
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
 #, fuzzy
 msgid "Delete the selected source from the list."
 msgstr "Delete the selected layer."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: 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 "
@@ -1666,37 +1722,33 @@
 "program."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431
-msgid "Language"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Colors"
 msgstr "Colours"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: 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 "Connection Settings to the OSM server."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Base Server URL"
 msgstr "Base Server 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 username (email)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
 msgid "OSM password"
 msgstr "OSM password"
 
-#: 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."
@@ -1708,146 +1760,108 @@
 "url.<br><b>Do not use a valuable Password.</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 specification (empty: read from first line in data)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
 msgid "Map Settings"
 msgstr "Map Settings"
 
-#: 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 "Settings for the map projection and data interpretation."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
 msgid "Projection method"
 msgstr "Projection method"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Annotation preset sources"
 msgstr ""
 
-#: 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
-#, fuzzy, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unknown file extension: {0}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-
-#: 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 ""
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-#, fuzzy
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segment"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-#, fuzzy
-msgid "Change Properties"
-msgstr "Properties"
-
-#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
-msgid "Contacting the OSM server..."
-msgstr "Contacting the OSM server..."
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41
-msgid "Conflicts in disjunct objects"
-msgstr "Conflicts in disjunct objects"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59
-#, java-format
-msgid "Downloading {0} {1}"
-msgstr "Downloading {0} {1}"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66
-msgid "Got more than one object when expecting only one."
-msgstr "Got more than one object when expecting only one."
-
-#: 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 "Downloading points {0} to {1}..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
+msgid "Downloading OSM data..."
+msgstr "Downloading OSM data..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
 msgid "Unknown version"
 msgstr "Unknown version"
 
-#: 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 "Found <seg> tag on non-way."
 
-#: 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 "Incomplete segment with 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. Possible some missing 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 "Illegal object with 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 "Couldn''t read time format \"{0}\"."
 
-#: 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 "Missing required attribute \"{0}\"."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
 msgid "Preparing data..."
 msgstr "Preparing data..."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
 msgid "Illformed Node id"
 msgstr "Illformed Node 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 "Upload {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 "Unknown host"
 
-#: 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 "Data error: lat value \"{0}\" is out of bound."
 
-#: 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 "Data error: lon value \"{0}\" is out of bound."
 
-#: 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 "Could not detect data format string."
 
-#: 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 "
@@ -1857,5 +1871,5 @@
 "format string in Preferences."
 
-#: 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"
@@ -1863,96 +1877,97 @@
 "Format string is incomplete. Need at least 'lat' and 'lon' specification"
 
-#: 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 "Unknown data type: \"{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 "Maybe add an format string in preferences."
 
-#: 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 "Parsing error in line {0}"
 
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Downloading points {0} to {1}..."
-
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Downloading OSM data..."
-
-#: src/org/openstreetmap/josm/io/OsmConnection.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: 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 "Warning: The password is transferred unencrypted."
 
-#: 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 "Save user and password (unencrypted)"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:116
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
 msgid "Aborting..."
 msgstr "Aborting..."
 
-#: 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 "Error during parse."
 
-#: 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 "different"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr "deleted"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr "true"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr "false"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr "none"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr "segments"
 
-#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr "to"
 
-#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr "from"
 
-#: 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 "new"
 
-#: 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 "unknown"
 
-#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
 #, fuzzy, java-format
 msgid "{0} node"
@@ -1961,52 +1976,52 @@
 msgstr[1] "{0} node"
 
-#: 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 "incomplete"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:134
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "background"
 msgstr "background"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:138
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "incomplete way"
 msgstr "incomplete way"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:139
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "selected"
 msgstr "selected"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:140
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
 msgid "gps point"
 msgstr "gps point"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:142
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
 msgstr ""
 
-#: 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 "Resolve {0} conflicts in {1} objects"
 
-#: src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr "Change"
 
-#: src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr "Sequence"
 
-#: 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 "Remove \"{0}\" for"
 
-#: 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 "Set {0}={1} for"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 #, fuzzy
 msgid "object"
@@ -2015,61 +2030,84 @@
 msgstr[1] "object"
 
-#: src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "An error occoured while saving."
-
-#: src/org/openstreetmap/josm/Main.java:176
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-
-#: src/org/openstreetmap/josm/Main.java:183
-msgid "Annotation Preset Tester"
-msgstr ""
-
-#: src/org/openstreetmap/josm/Main.java:195
-msgid "Files"
-msgstr "Files"
-
-#: src/org/openstreetmap/josm/Main.java:206
-msgid "Connection"
-msgstr "Connection"
-
-#: src/org/openstreetmap/josm/Main.java:213
-msgid "Layer"
-msgstr "Layer"
-
-#: src/org/openstreetmap/josm/Main.java:234
-msgid "Help"
-msgstr "Help"
-
-#: 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 "Could not read \"{0}\""
 
-#: src/org/openstreetmap/josm/Main.java:293
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
 msgid "unnamed"
 msgstr "unnamed"
 
-#: 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 "The projection could not be read from preferences. Using EPSG: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 "Ignoring malformed 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 "Ignoring malformed file 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 "Download and show landsat background images."
+
+#: ../landsat/src/landsat/LandsatLayer.java:45
+#, fuzzy
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr "Wrong longitude transformation for tile cache. Can't operate on {0}"
+
+#: ../landsat/src/landsat/LandsatLayer.java:70
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "WMS layer: {0}"
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid "Annotation Preset Tester"
+msgstr ""
+
+#: ../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 ""
+
+#~ msgid "Download {0} ways containing a total of {1} segments?"
+#~ msgstr "Download {0} ways containing a total of {1} segments?"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Refresh the selection list."
+
+#~ msgid "Search for objects."
+#~ msgstr "Search for objects."
+
+#~ msgid "Conflicts in disjunct objects"
+#~ msgstr "Conflicts in disjunct objects"
+
+#~ msgid "Downloading {0} {1}"
+#~ msgstr "Downloading {0} {1}"
+
+#~ msgid "Got more than one object when expecting only one."
+#~ msgstr "Got more than one object when expecting only one."
+
 #~ msgid "Used in a way."
 #~ msgstr "Used in a way."
@@ -2084,7 +2122,4 @@
 #~ msgstr "Show background"
 
-#~ msgid "Download and show landsat background images."
-#~ msgstr "Download and show landsat background images."
-
 #~ msgid "Images"
 #~ msgstr "Images"
@@ -2092,10 +2127,4 @@
 #~ msgid "Time loop in gps data."
 #~ msgstr "Time loop in gps data."
-
-#~ msgid "Wrong longitude transformation for tile cache. Can't operate on {0}"
-#~ msgstr "Wrong longitude transformation for tile cache. Can't operate on {0}"
-
-#~ msgid "WMS layer: {0}"
-#~ msgstr "WMS layer: {0}"
 
 #~ msgid "OptionPane.okButtonText"
Index: utils/josm/plugins/lang-fr/build.xml
===================================================================
--- utils/josm/plugins/lang-fr/build.xml	(revision 1467)
+++ utils/josm/plugins/lang-fr/build.xml	(revision 1469)
@@ -2,9 +2,16 @@
 
 	<property name="language" value="fr" />
-	<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-fr/fr.po
===================================================================
--- utils/josm/plugins/lang-fr/fr.po	(revision 1467)
+++ utils/josm/plugins/lang-fr/fr.po	(revision 1469)
@@ -7,5 +7,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-07 17:02+0200\n"
+"POT-Creation-Date: 2006-10-13 23:15+0200\n"
 "PO-Revision-Date: 2006-07-21 21:36+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -16,62 +16,62 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\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 "Ajouter un segment."
 
-#: 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 "Ajouter un segment entre deux noeuds."
 
-#: 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 "Supprimer"
 
-#: 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 "Supprimer des noeuds, des rues ou des segments."
 
-#: 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 "Impossible de supprimer le noeud."
 
-#: 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 "Cet objet est en utilisation."
 
-#: 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 "Utilisé par plus de deux segments."
 
-#: 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 "Utilisé par un seul segment."
 
-#: 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 "Segments dans la mauvaise direction."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Clés conflictuelles"
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
 msgid "Delete Node"
 msgstr "Supprimer un noeud"
 
-#: 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 ""
@@ -79,44 +79,44 @@
 "droite, +, -)"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Sélection"
 
-#: 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 ""
 "Sélectionner des objets en cliquant ou en définissant une zone à la souris."
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Ligne droite"
 
-#: 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 "Sélectionner des objets sur une ligne droite."
 
-#: 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 "Déplacer"
 
-#: 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 "Impossible de déplacer des objets en dehors de la Terre."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Ajouter un chemin"
 
-#: 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 "Ajouter un nouveau chemin aux données;"
 
-#: 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."
@@ -125,5 +125,5 @@
 "avant d'ajouter des segments."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, fuzzy, java-format
 msgid ""
@@ -146,9 +146,9 @@
 "chemins ?"
 
-#: 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 "Ajouter des segments aux chemins"
 
-#: 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 ""
@@ -156,17 +156,17 @@
 "sélectionné ?"
 
-#: 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 "Ajouter des segments au chemin ?"
 
-#: 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 "Réorganiser tous les segments de la ligne ?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Réorganiser ?"
 
-#: 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?"
@@ -175,66 +175,94 @@
 msgstr[1] "Créer un nouveau chemin constitué de {0} segments ?"
 
-#: 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 "Créer un nouveau chemin"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node"
 msgstr "Ajouter un noeud"
 
-#: 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 "Ajouter un nouveau noeud à la carte"
 
-#: 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 "Ajouter un noeud dans un segment"
 
-#: 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 "Ajouter un noeud dans un segment existant"
 
-#: 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 "Impossible d'ajouter un noeud en dehors de la Terre."
 
-#: 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 "Ajouter un noeud dans un segment"
 
-#: 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 "Téléchargement des données GPS"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr "Téléchargement des données GPS"
+
+#: ../../../../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 "Téléchargement des données"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr "Aucune donnée importée"
+
+#: ../../../../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 "Calque de données"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 #, fuzzy
 msgid "Reverse Segments"
 msgstr "segments"
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 #, fuzzy
 msgid "Revert the direction of all selected Segments."
 msgstr "Segments dans la mauvaise direction."
 
-#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
 #, fuzzy
 msgid "Please select at least one segment."
 msgstr "Sélectionner l'étage à supprimer."
 
-#: 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 "Préférences"
 
-#: 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 "Ouvrir la page des préférences pour les réglages généraux."
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr "Ouvrir un fichier"
 
-#: 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 ""
@@ -242,36 +270,91 @@
 "implémenté."
 
-#: 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 "Extension de fichier inconnue : {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 "Erreur pendant le traitement {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 "Impossible de lire \"{0}\""
 
-#: 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 "Impossible de lire \"{0}\""
+
+#: ../../../../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 "Impossible de détecter le texte de format des données."
+
+#: ../../../../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 ""
+"Fusionner les calques sélectionnés dans le calque directement en dessous."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+#, fuzzy
+msgid "Please select at least four nodes."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+msgid "Rename layer"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#, fuzzy, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Impossible de lire \"{0}\""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Annuler la dernière action."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download from OSM"
 msgstr "Télécharger depuis OSM"
 
-#: 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 "Télécharger une carte de données depuis le serveur OSM."
 
-#: 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 "
@@ -281,155 +364,155 @@
 "une zone à télécharger en faisant glisser la souris bouton principal enfoncé."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:105
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
 msgid "Bounding box"
 msgstr "Zone sélectionnée"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
 msgid "min lat"
 msgstr "lat min"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:108
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
 msgid "min lon"
 msgstr "lon min"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:110
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
 msgid "max lat"
 msgstr "lat max"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:112
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
 msgid "max lon"
 msgstr "lon max"
 
-#: 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 "Téléchargement des données"
 
-#: 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 à partir de www.openstreetmap.org"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:182
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
 msgid "Bookmarks"
 msgstr "Marque-pages"
 
-#: 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 "Ajouter"
 
-#: 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 "Entrez les coordonnées désirées en premier."
 
-#: 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 "Entrez un nom pour cet emplacement."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:219
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
 msgid "Select a bookmark first."
 msgstr "Sélectionner un marque-page en premier."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:238
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
 msgid "Choose an area"
 msgstr "Choisir une zone"
 
-#: 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 "Entrez les coordonnées désirées ou cliquez sur un marque-page."
 
-#: 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 "Sélectionner l'étage à supprimer."
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr "Quitter l'application."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "À propos"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Montrer l'à propos."
 
-#: 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 "dernier changement à {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 "Page d'accueil"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Rapports de bug"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
 #, fuzzy
 msgid "News about JOSM"
 msgstr "À propos de 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 "Lisez-moi"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Révision"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribution"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:85
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
 msgid "About JOSM..."
 msgstr "À propos de 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 "Impossible de trouver le fichier."
 
-#: 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 "Aucun document ouvert donc rien à sauvegarder."
 
-#: 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 "Le document ne contient aucune donnée. Sauvegarder quand même ?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "Empty document"
 msgstr "Document vide"
 
-#: 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 "
@@ -439,39 +522,39 @@
 "sauvegardés si vous ne les traitez pas. Continuer ?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid "Conflicts"
 msgstr "Conflits"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "File exists. Overwrite?"
 msgstr "Le fichier existe déjà. Écrire dessus ?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "Overwrite"
 msgstr "Écrire dessus"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "données"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "sélection"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr "calque"
 
-#: 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 "conflit"
 
-#: 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 "Zoom auto : {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)"
@@ -479,66 +562,77 @@
 "Zoomer automatiquement sur la vue ({0}) (Annuler si la vue est déplacée)"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save as"
+msgstr "Sauvegarder"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save the current data to a new file."
+msgstr "Sauvegarder les données actuelles"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fichiers d'un serveur OSM (.osm .xml)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "Fichiers GPX (.gpx)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fichiers CSV (.csv .txt)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Charger sur OSM"
 
-#: 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 "Charger tous les changements sur le serveur d'OSM."
 
-#: 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 "Rien à charger. Obtenez d'abord des données."
 
-#: 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 ""
 "Certains conflits ne sont pas résolus. Vous devez d'abord les résoudre."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Chargement des données"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:97
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
 msgid "No changes to upload."
 msgstr "Aucuns changements à charger."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
 msgid "Objects to add:"
 msgstr "Objets à ajouter : "
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Objects to modify:"
 msgstr "Objets à modifier : "
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
 msgid "Objects to delete:"
 msgstr "Objets à supprimer : "
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:129
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
 msgid "Upload this changes?"
 msgstr "Charger ces changements ?"
 
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "Fichiers d'un serveur OSM (.osm .xml)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "Fichiers GPX (.gpx)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "Fichiers CSV (.csv .txt)"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Refaire"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refaire la dernière action annulée"
-
-#: 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 "Aide"
+
+#: ../../../../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
 #, fuzzy, java-format
 msgid "Downloading {0} segment"
@@ -547,206 +641,125 @@
 msgstr[1] "Télchargement de {0} segment"
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Aucune donnée importée"
-
-#: 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 "Calque de données"
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
 msgid "Download incomplete objects"
 msgstr "Télécharger les objets incomplets"
 
-#: 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 ""
 "Télécharger tous les chemins sélectionnés incomplets depuis le serveur OSM."
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
-#, java-format
-msgid "Download {0} ways containing a total of {1} segments?"
-msgstr "Télécharger {0} chemins contenant un total de {1} segments ?"
-
-#: 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 "Sélectionner une couleur"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#, fuzzy, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Télécharger les objets incomplets"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
 msgid "Download?"
 msgstr "Télécharger ?"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refaire"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refaire la dernière action annulée"
+
+#: ../../../../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 ""
+"Note : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
+"des traces sous licence GPL."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Exporter en GPX"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Exporter les données en un fichier GPX."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Rien à exporter.Obtenez d'abord des données."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "description de la trace GPS"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Ajouter des informations sur l'auteur"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Nom réel"
+
+#: ../../../../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 "Prédéfini"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "Année du copyright"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Options d'export"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Erreur à l'export {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+msgid "Error"
+msgstr "Erreur"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Choisir une licence prédéfinie"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save the current data."
 msgstr "Sauvegarder les données actuelles"
 
-#: 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 "Sortie en CSV pas encore supportée."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
 msgid "Unknown file extension."
 msgstr "Extension de fichier inconnue."
 
-#: 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 "Une erreur s'est produite pendant la sauvegarde."
 
-#: 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 ""
-"Note : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
-"des traces sous licence GPL."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Exporter en GPX"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Exporter les données en un fichier GPX."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Rien à exporter.Obtenez d'abord des données."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "description de la trace GPS"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Ajouter des informations sur l'auteur"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Nom réel"
-
-#: 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 "Prédéfini"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "Année du copyright"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Mots-clés"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Options d'export"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Erreur à l'export {0}"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Erreur"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Choisir une licence prédéfinie"
-
-#: 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 "Téléchargement des données"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
-msgid "Raw GPS data"
-msgstr "Téléchargement des données GPS"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Téléchargement des données GPS"
-
-#: 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 "Impossible de lire \"{0}\""
-
-#: 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 "Impossible de détecter le texte de format des données."
-
-#: 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 ""
-"Fusionner les calques sélectionnés dans le calque directement en dessous."
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
-msgid "Please select at least four nodes."
-msgstr "Sélectionner l'étage à supprimer."
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, fuzzy, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Impossible de lire \"{0}\""
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save as"
-msgstr "Sauvegarder"
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save the current data to a new file."
-msgstr "Sauvegarder les données actuelles"
-
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #, java-format
 msgid ""
@@ -756,13 +769,13 @@
 msgstr ""
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr "Rapporter un bug"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occoured.\n"
@@ -776,9 +789,9 @@
 "version de JOSM, il serait aimable de produire un rapport de bug."
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr "Exception inattendue"
 
-#: 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"
@@ -788,5 +801,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."
@@ -796,87 +809,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 "Ctrl-"
 
-#: 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 "Une erreur s'est produite pendant la sauvegarde."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Charger la sélection"
 
-#: 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 "Contact de {0}..."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: 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 "Impossible de lire quelque chose depuis l'URL : \"{0}\""
 
-#: 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 "Erreur d'analyse dans l'URL : \"{0}\""
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: 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 "Ouvrir une fenêtre de sélection de liste."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-msgid "Select"
-msgstr "Sélectionner"
-
-#: 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 ""
-"Remplacer les éléments de la carte par les éléments sélectionnés de cette "
-"liste."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Recharger"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
-msgid "Refresh the selection list."
-msgstr "Actualiser la liste de sélection"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
-msgid "Search"
-msgstr "Chercher"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search for objects."
-msgstr "Rechercher des objets"
-
-#: 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 "Entrer le texte à rechercher."
 
-#: 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 "
@@ -893,89 +880,116 @@
 "·key=foot·associé à n'importe quelle valeur.</ul></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 "remplacer la sélection"
 
-#: 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 "ajouter à la sélection"
 
-#: 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 "supprimer de la sélection"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
+msgid "Search"
+msgstr "Chercher"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr "Conflit"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr "Gérer les conflits"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr "Résoudre"
 
-#: 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 ""
 "Ouvrir une une fenêtre de fusion des éléments sélectionnés de cette liste."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid "Select"
+msgstr "Sélectionner"
+
+#: ../../../../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 ""
+"Remplacer les éléments de la carte par les éléments sélectionnés de cette "
+"liste."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
 msgid "Please select something from the conflict list."
 msgstr "Sélectionnez un élément de la liste des conflits."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve Conflicts"
 msgstr "Résoudre les conflits"
 
-#: 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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr "Recharger"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+#, fuzzy
+msgid "Revert"
+msgstr "Supprimer"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+msgid "Object"
+msgstr "Objet"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: ../../../../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 "Pas encore implémenté."
+
+#: ../../../../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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Pile de commandes"
 
-#: 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 "Ouvrir une liste de toutes les commandes (annuler le buffer)"
 
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
-msgid "Delete the selected layer."
-msgstr "Supprimer le calque sélectionné."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
-msgid "Show/Hide"
-msgstr "Montrer/Cacher"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Toggle visible state of the selected layer."
-msgstr "Change la visibilité du calque sélectionné."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Layers"
-msgstr "Calque"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Open a list of all loaded layers."
-msgstr "Ouvrir une liste de tous les calques chargés."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
-msgid "Move the selected layer one row up."
-msgstr "Déplacer le calque sélectionné un étage au-dessus."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
-msgid "Move the selected layer one row down."
-msgstr "Déplacer le calque sélectionné un étage en-dessous."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
-msgid "Merge the selected layer into the layer directly below."
-msgstr ""
-"Fusionner les calques sélectionnés dans le calque directement en dessous."
-
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
 #, fuzzy
 msgid "Please select the objects you want to change properties for."
 msgstr "Sélectionner l'étage à supprimer."
 
-#: 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."
@@ -984,5 +998,5 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
 msgid ""
@@ -992,46 +1006,46 @@
 "vide supprime la clé)"
 
-#: 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 "Changer les valeurs ?"
 
-#: 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 "<différent>"
 
-#: 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 ""
 
-#: 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 "Sélectionner une clé"
 
-#: 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 "Sélectionner une valeur"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Properties"
 msgstr "Propriétés"
 
-#: 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 "Propriétés des objets sélectionnés."
 
-#: 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 "Impossible de lire le fichier d'annotations : {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 "Erreur de traitement {0}"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -1040,87 +1054,112 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: 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 "Clé"
 
-#: 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 "Valeur"
 
-#: 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 "Sélectionnez l'étage à éditer."
 
-#: 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 "Sélectionner l'étage à supprimer."
 
-#: 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 "Ajouter un nouveau couple clé/valeur à tous les objets"
 
-#: 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 "Éditer"
 
-#: 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 "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: 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 "Supprimer la clé sélectionnée de tous les objets"
 
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-#, fuzzy
-msgid "Revert"
-msgstr "Supprimer"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: src/org/openstreetmap/josm/gui/MapStatus.java:224
-msgid "Object"
-msgstr "Objet"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178
-msgid "Not implemented yet."
-msgstr "Pas encore implémenté."
-
-#: 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 ""
-
-#: 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 "Supprimer le calque sélectionné."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+msgid "Show/Hide"
+msgstr "Montrer/Cacher"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+msgid "Toggle visible state of the selected layer."
+msgstr "Change la visibilité du calque sélectionné."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Layers"
+msgstr "Calque"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Open a list of all loaded layers."
+msgstr "Ouvrir une liste de tous les calques chargés."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+msgid "Move the selected layer one row up."
+msgstr "Déplacer le calque sélectionné un étage au-dessus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+msgid "Move the selected layer one row down."
+msgstr "Déplacer le calque sélectionné un étage en-dessous."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+msgid "Merge the selected layer into the layer directly below."
+msgstr ""
+"Fusionner les calques sélectionnés dans le calque directement en dessous."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, fuzzy, java-format
+msgid "Unknown type at line {0}"
+msgstr "Extension de fichier inconnue : {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 ""
+
+#: ../../../../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 ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+#, fuzzy
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "segment"
+msgstr[1] "segments"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Changer les propriétés"
+
+#: ../../../../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"
@@ -1128,7 +1167,7 @@
 msgstr[1] "noeuds"
 
-#: 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"
@@ -1136,7 +1175,7 @@
 msgstr[1] "segments"
 
-#: 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"
@@ -1144,23 +1183,23 @@
 msgstr[1] "chemins"
 
-#: 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 "Il y a eu des conflits pendant l'import."
 
-#: 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} consiste en :"
 
-#: 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} supprimés)"
 
-#: 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 "Convertir en un calque de données"
 
-#: 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"
@@ -1168,5 +1207,5 @@
 msgstr[1] "traces"
 
-#: 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"
@@ -1174,5 +1213,5 @@
 msgstr[1] "points"
 
-#: 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"
@@ -1181,5 +1220,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, fuzzy, java-format
 msgid "{0} consists of {1} track"
@@ -1188,5 +1227,5 @@
 msgstr[1] "{0} consiste en {1} traces"
 
-#: 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"
@@ -1195,110 +1234,110 @@
 msgstr[1] "{0} points"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, fuzzy
 msgid "Customize line drawing"
 msgstr "Personnaliser la couleur"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 #, fuzzy
 msgid "Use global settings."
 msgstr "Réglages d'affichage"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 #, fuzzy
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points GPS bruts."
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 #, fuzzy
 msgid "Do not draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points GPS bruts."
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "OK"
 msgstr "OK"
 
-#: 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 "Annuler"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "Default"
 msgstr "Par défaut"
 
-#: 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 "Choisir une couleur"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Import images"
 msgstr "Import des images"
 
-#: 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 "images JPEG (*.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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Lecture du 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 "Aucune heure pour le point {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 "Impossible de lire l'heure \"{0}\" du point {1} x {2}"
 
-#: 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 "Aucune image avec des informations horaires lisibles trouvée."
 
-#: 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 "Lecture de {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 "Images géomarquées"
 
-#: 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 "Allumage du GPS : {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 "Extinction du GPS : {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 "variation actuelle : {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 "différence de fuseau horaire : "
 
-#: 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"
@@ -1306,62 +1345,62 @@
 msgstr[1] "images"
 
-#: 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} dans la trace."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Synchroniser l'horloge"
 
-#: 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 "La date du fichier \"{0}\" ne peut être analysée."
 
-#: 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 "Il n'y a aucune heure EXIF associée au fichier \"{0}\"."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Image"
 
-#: 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 "Entrez la date et l'heure montrées (mm/jj/aaaa 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 "Zone horaire de l'unité GPS (différence avec la photo)"
 
-#: 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 "Synchroniser l'heure avec l'unité GPS"
 
-#: 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 "L'heure indiquée ne peut être analysée."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
 msgid "Could not read bookmarks."
 msgstr "Impossible de lire les marque-pages."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:98
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
 msgid "Could not write bookmark."
 msgstr "Impossible d'écrire un marque-page."
 
-#: 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 Open Street Map - 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 "le calque n'est pas dans la 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 ""
@@ -1369,69 +1408,69 @@
 "sur le serveur."
 
-#: 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 "Certains changements ne sont pas sauvegardés. Quitter quand même ?"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
 msgid "Unsaved Changes"
 msgstr "Changements non sauvegardés"
 
-#: 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 "usage"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "options"
 msgstr "Options"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Download the bounding box"
 msgstr "Télécharge la zone sélectionnée"
 
-#: 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 "Télécharge l'emplacement donné par l'URL (avec lat=x&lon=y&zoom=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 "Ouvrir un fichier (en GPS brut si .gpx ou .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 "Télécharger la zone sélectionnée en GPS brut."
 
-#: 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 "Sélectionner les résultats de la recherche."
 
-#: 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 "Ne pas lancer en plein écran"
 
-#: 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 "Rétablir les préférences par défaut"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Set the language. Example: "
 msgstr "Choisir la langue. Exemple : "
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "examples"
 msgstr "exemples"
 
-#: 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"
@@ -1442,13 +1481,29 @@
 "sur d'avoir chargé des données avant --selection"
 
-#: 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 "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
-#: src/org/openstreetmap/josm/gui/MapStatus.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
+msgid "Layer"
+msgstr "Calque"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
+msgid "Files"
+msgstr "Fichiers"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+msgid "Contacting the OSM server..."
+msgstr "Contact du serveur OSM..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
 
-#: 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:"
@@ -1457,50 +1512,50 @@
 msgstr[1] "{0} objets sont conflictuels :"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr "ma version :"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr "version du serveur : "
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr "version choisie : "
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
 msgid "Error while parsing"
 msgstr "Erreur d'analyse"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
 msgid "File Not found"
 msgstr "Fichier non trouvé"
 
-#: 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 "texte"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr "Nom de l'utilisateur"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr "Mot de passe OSM"
 
-#: 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 ""
 "Redimensionner l'applet aux proportions donnnées (format LARGEURxHAUTEUR)"
 
-#: 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 "texte;texte;..."
 
-#: 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 "
@@ -1510,5 +1565,5 @@
 "contenant lat=y&lon=x&zoom=z ou encore un nom de fichier."
 
-#: 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 "
@@ -1518,5 +1573,5 @@
 "y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
 
-#: 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 "
@@ -1526,44 +1581,44 @@
 "comme pour Google ou un URL retournant du osm-xml"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr "n'importe"
 
-#: 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 ""
 "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
 
-#: 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 "Nom d'utilisateur"
 
-#: 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 "Mot de passe"
 
-#: 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 "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
 
-#: 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 "Dessiner des lignes entre les points GPS bruts."
 
-#: 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 "Forcer les lignes si aucun segment importé"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: 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."
@@ -1572,47 +1627,47 @@
 "d'informationsur les lignes."
 
-#: 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 "Dessine de plus gros points GPS."
 
-#: 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 "Dessine les flèches de direction pour tous les segments."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 msgid "Color"
 msgstr "Couleur"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
 msgid "Name"
 msgstr "Nom"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
 msgid "Choose"
 msgstr "Choisir"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select a color."
 msgstr "Sélectionner une couleur"
 
-#: 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 "Choisir une couleur pour {0}"
 
-#: 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 "Source du fichier d'annotations"
 
-#: 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 "L'URL de base du serveur OSM (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 "Nom d'utilisateur (e-mail) de votre compte OSM."
 
-#: 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."
@@ -1621,9 +1676,9 @@
 "aucun mot de passe."
 
-#: 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 "L'URL du serveur récupérant les images de l'arrière-plan WMS."
 
-#: 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</"
@@ -1642,5 +1697,5 @@
 "par une virgule.</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 "
@@ -1650,9 +1705,9 @@
 "dessiner des lignes le long de votre chemin."
 
-#: 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 "Couleurs utilisées par les différents objets de JOSM."
 
-#: 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 "
@@ -1662,17 +1717,17 @@
 "josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
 
-#: 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 "Ajouter un nouveau fichier d'annotations à la liste."
 
-#: 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 "Supprimer la source sélectionné de la liste."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
 msgid "Display Settings"
 msgstr "Réglages d'affichage"
 
-#: 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 "
@@ -1680,37 +1735,33 @@
 msgstr "Divers réglages de l'apparence de tout le programme."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
 msgid "Look and Feel"
 msgstr "Apparence et comportement"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431
-msgid "Language"
-msgstr "Langue"
-
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: 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 "Réglages de connexion au serveur OSM"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:448
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
 msgid "OSM username (email)"
 msgstr "Nom d'utilisateur OSM (e-mail)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: 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."
@@ -1722,5 +1773,5 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</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 ""
@@ -1728,142 +1779,105 @@
 "données)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: 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 ""
 "Réglages pour la projection de la carte et l'interprétation des données."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
 msgid "Projection method"
 msgstr "Méthode de projection"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Annotation preset sources"
 msgstr "Sources des annotations prédéfinies"
 
-#: 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
-#, fuzzy, java-format
-msgid "Unknown type at line {0}"
-msgstr "Extension de fichier inconnue : {0}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-
-#: 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 ""
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-#, fuzzy
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segments"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Changer les propriétés"
-
-#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
-msgid "Contacting the OSM server..."
-msgstr "Contact du serveur OSM..."
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41
-msgid "Conflicts in disjunct objects"
-msgstr "Conflits dans des objets disjoints"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59
-#, java-format
-msgid "Downloading {0} {1}"
-msgstr "Téléchargement {0} {1}"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66
-msgid "Got more than one object when expecting only one."
-msgstr "Plus de deux objets acquis alors qu'un seul était attendu."
-
-#: 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 "Téléchargement des points {0} {1}..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
+msgid "Downloading OSM data..."
+msgstr "Téléchargement des données OSM..."
+
+#: ../../../../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 inconnue"
 
-#: 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 "Tag <seg> trouvé en dehors d'un chemin."
 
-#: 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 "Le segment avec l'id=0 est incomplet"
 
-#: 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.·Possibilité de tags manquants."
 
-#: 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 "L'objet avec l'id=0 est illégal"
 
-#: 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 "Impossible de lire le format horaire \"{0}\""
 
-#: 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 "Attribut requis \"{0}\" manquant."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
 msgid "Preparing data..."
 msgstr "Préparation des données..."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
 msgid "Illformed Node id"
 msgstr "id du noeud malformé"
 
-#: 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 "Charge {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 "Hôte inconnu"
 
-#: 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 "Erreur de données : La valeur de latitude \"{0}\" est hors limite."
 
-#: 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 "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
 
-#: 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 "Impossible de détecter le texte de format des données."
 
-#: 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 "
@@ -1873,5 +1887,5 @@
 "format manuellement dans les préférences."
 
-#: 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"
@@ -1880,96 +1894,97 @@
 "minimum sont requises."
 
-#: 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 "Type de données inconnu : \"{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 "Définissez peut-être le format dans les préférences."
 
-#: 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 "Analyse de l'erreur ligne {0}"
 
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Téléchargement des points {0} {1}..."
-
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Téléchargement des données OSM..."
-
-#: src/org/openstreetmap/josm/io/OsmConnection.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d'utilisateur incorrect."
 
-#: 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 "Attention : Le mot de passe est transféré non-crypté."
 
-#: 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 "Sauvegarder l'utilisateur et le mot de passe (non crypté)"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Enter Password"
 msgstr "Entrer un mot de passe"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:116
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
 msgid "Aborting..."
 msgstr "Échec..."
 
-#: 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 "Erreur pendant l'analyse."
 
-#: 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 "différent"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr "supprimé"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr "vrai"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr "faux"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr "rien"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr "segments"
 
-#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr "depuis"
 
-#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr "à"
 
-#: 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 "nouveau"
 
-#: 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 "inconnu"
 
-#: 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"
@@ -1978,52 +1993,52 @@
 msgstr[1] "{0} noeuds"
 
-#: 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 "incomplet"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:134
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "background"
 msgstr "arrière plan"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:138
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "incomplete way"
 msgstr "chemin incomplet"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:139
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "selected"
 msgstr "sélectionné"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:140
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
 msgid "gps point"
 msgstr "point GPS"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:142
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
 msgstr "mesure"
 
-#: 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 "Résoudre {0} conflits dans {1} objets"
 
-#: src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr "Changer"
 
-#: src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr "Séquence"
 
-#: 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 "Supprime \"{0}\" pour"
 
-#: 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 "Affecte {0}={1} pour"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -2031,49 +2046,19 @@
 msgstr[1] "objets"
 
-#: src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "Une erreur s'est produite pendant la sauvegarde."
-
-#: src/org/openstreetmap/josm/Main.java:176
-msgid "You have to specify annotation sources in the preferences first."
-msgstr ""
-
-#: src/org/openstreetmap/josm/Main.java:183
-#, fuzzy
-msgid "Annotation Preset Tester"
-msgstr "Source du fichier d'annotations"
-
-#: src/org/openstreetmap/josm/Main.java:195
-msgid "Files"
-msgstr "Fichiers"
-
-#: src/org/openstreetmap/josm/Main.java:206
-msgid "Connection"
-msgstr "Connexion"
-
-#: src/org/openstreetmap/josm/Main.java:213
-msgid "Layer"
-msgstr "Calque"
-
-#: src/org/openstreetmap/josm/Main.java:234
-msgid "Help"
-msgstr "Aide"
-
-#: 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 "Impossible de lire \"{0}\""
 
-#: src/org/openstreetmap/josm/Main.java:293
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: 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 ""
@@ -2081,14 +2066,72 @@
 "utilisé."
 
-#: src/org/openstreetmap/josm/Main.java:401
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{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 "Ignore le fichier malformé d'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 "Télécharger et montrer les images d'arrière-plan landsat."
+
+#: ../landsat/src/landsat/LandsatLayer.java:45
+#, fuzzy
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Mauvaise transformation de longitude pour le cache. Ne peut pas opérer sur "
+"{0}"
+
+#: ../landsat/src/landsat/LandsatLayer.java:70
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "calque WMS :{0}"
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+#, fuzzy
+msgid "Annotation Preset Tester"
+msgstr "Source du fichier d'annotations"
+
+#: ../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 ""
+
+#~ msgid "Download {0} ways containing a total of {1} segments?"
+#~ msgstr "Télécharger {0} chemins contenant un total de {1} segments ?"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Actualiser la liste de sélection"
+
+#~ msgid "Search for objects."
+#~ msgstr "Rechercher des objets"
+
+#~ msgid "Language"
+#~ msgstr "Langue"
+
+#~ msgid "Conflicts in disjunct objects"
+#~ msgstr "Conflits dans des objets disjoints"
+
+#~ msgid "Downloading {0} {1}"
+#~ msgstr "Téléchargement {0} {1}"
+
+#~ msgid "Got more than one object when expecting only one."
+#~ msgstr "Plus de deux objets acquis alors qu'un seul était attendu."
+
 #~ msgid "Used in a way."
 #~ msgstr "Utilisé par un chemin."
@@ -2103,7 +2146,4 @@
 #~ msgstr "Montrer l'arrière-plan"
 
-#~ msgid "Download and show landsat background images."
-#~ msgstr "Télécharger et montrer les images d'arrière-plan landsat."
-
 #~ msgid "Images"
 #~ msgstr "Images"
@@ -2111,12 +2151,4 @@
 #~ msgid "Time loop in gps data."
 #~ msgstr "Boucle horaire dans les données GPS."
-
-#~ msgid "Wrong longitude transformation for tile cache. Can't operate on {0}"
-#~ msgstr ""
-#~ "Mauvaise transformation de longitude pour le cache. Ne peut pas opérer "
-#~ "sur {0}"
-
-#~ msgid "WMS layer: {0}"
-#~ msgstr "calque WMS :{0}"
 
 #~ msgid "OptionPane.okButtonText"
Index: utils/josm/plugins/lang-ro/build.xml
===================================================================
--- utils/josm/plugins/lang-ro/build.xml	(revision 1467)
+++ utils/josm/plugins/lang-ro/build.xml	(revision 1469)
@@ -2,9 +2,16 @@
 
 	<property name="language" value="ro" />
-	<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-ro/ro.po
===================================================================
--- utils/josm/plugins/lang-ro/ro.po	(revision 1467)
+++ utils/josm/plugins/lang-ro/ro.po	(revision 1469)
@@ -8,5 +8,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-07 17:02+0200\n"
+"POT-Creation-Date: 2006-10-13 23:14+0200\n"
 "PO-Revision-Date: 2006-08-31 14:46+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
@@ -21,104 +21,104 @@
 "X-Poedit-SourceCharset: utf-8\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 "Adaugă segment"
 
-#: 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 "Adaugă un segment între două noduri."
 
-#: 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 "Şterge"
 
-#: 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 "Şterge noduri, străzi sau segmente."
 
-#: 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 "Nu pot şterge nodul."
 
-#: 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 "Acest obiect este în uz."
 
-#: 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 "Folosit de mai mult de două segmente."
 
-#: 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 "Folosit de un singur segment."
 
-#: 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 "Direcţie greşită a segmentelor."
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Chei în conflict"
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
 msgid "Delete Node"
 msgstr "Şterge nod"
 
-#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
 msgstr "Apropie"
 
-#: 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 "Apropie prin tragere. (Ctrl-sus,stânda,jos,dreapta,+,-)"
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Selection"
 msgstr "Selecţie"
 
-#: 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 "Selectează obiecte prin tragere sau clic."
 
-#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
 msgid "Straight line"
 msgstr "Linie dreaptă"
 
-#: 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 "Selectează obiectele din o linie dreaptă."
 
-#: 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 "Mută"
 
-#: 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 "Nu pot muta obiecte în afara lumii."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Adaugă cale"
 
-#: 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 "Adaugă o nouă cale datelor."
 
-#: 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."
@@ -127,5 +127,5 @@
 "a adăuga segmente."
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -145,25 +145,25 @@
 "Doriţi în schimb să selectaţi toate segmentele aparţinând căilor?"
 
-#: 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 "Adaugă segmente din căi"
 
-#: 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 "Doriţi să adăugaţi toate celelalte segmente selectate căii selectate?"
 
-#: 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 "Adaug segmente căii?"
 
-#: 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 "Reordonez toate segmentele de dreaptă?"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Reordonez?"
 
-#: 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?"
@@ -173,98 +173,180 @@
 msgstr[2] "Crează o cale nouă din {0} de segmente?"
 
-#: 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 "Crează o nouă cale"
 
-#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node"
 msgstr "Adaugă nod"
 
-#: 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 "Adaugă un nod pe hartă"
 
-#: 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 "Adaugă un nod la segment"
 
-#: 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 "Adaugă un nod la un segment existent"
 
-#: 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 "Nu pot adăuga un nod în afara lumii."
 
-#: 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 "Adaugă nod în segment"
 
-#: 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 "Descarc date GPS"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr "Descarc date GPS"
+
+#: ../../../../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 "Descarc date"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr "Nu au fost importate date."
+
+#: ../../../../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 "Strat de date"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 msgid "Reverse Segments"
 msgstr "Inversează segmentele"
 
-#: 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 "Inversează direcţia tuturor segmentelor selectate."
 
-#: 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 "Vă rog selectaţi cel puţin un segment."
 
-#: 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 "Preferinţe"
 
-#: 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 "Deschide o pagină de preferinţe pentru opţiunile globale"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Deschide"
 
-#: src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr "Deschide un fişier."
 
-#: 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 "Importul CSV Data pentru date non-GPS nu este încă implementat."
 
-#: 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 "Extensie fişier necunoscută : {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 "Eroare la prelucrarea {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 "Nu am putut citi \"{0}\""
 
-#: 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 "Nu am putut citi \"{0}\""
+
+#: ../../../../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 "Nu am putut detecta şirul de format al datelor."
+
+#: ../../../../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 "Uneşte stratul selectat cu stratul imediat inferior."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+#, fuzzy
+msgid "Please select at least four nodes."
+msgstr "Vă rog selectaţi cel puţin un segment."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+msgid "Rename layer"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+msgid "Also rename the file"
+msgstr ""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#, fuzzy, java-format
+msgid "Could not rename the file \"{0}\"."
+msgstr "Nu am putut citi \"{0}\""
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Anulează"
 
-#: src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Anulează ultima acţiune."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download from OSM"
 msgstr "Descarcă de la OSM"
 
-#: 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 "Descarcă hărţi de la serverul OSM."
 
-#: 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 "
@@ -274,156 +356,156 @@
 "ce va fi descărcată."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:105
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
 msgid "Bounding box"
 msgstr "Perimetru selectat"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
 msgid "min lat"
 msgstr "min lat"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:108
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
 msgid "min lon"
 msgstr "min lon"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:110
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
 msgid "max lat"
 msgstr "max lat"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:112
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
 msgid "max lon"
 msgstr "max lon"
 
-#: 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 "Descarc date"
 
-#: 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 "Adresa de la www.openstreetmap.org"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:182
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
 msgid "Bookmarks"
 msgstr "Semne de carte"
 
-#: 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 "Adaugă"
 
-#: 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 "Vă rog întâi introduceţi coordonatele dorite."
 
-#: 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 "Vă rog introduceţi un nume pentru locaţie."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:214
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
 msgid "Remove"
 msgstr "Elimină"
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:219
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
 msgid "Select a bookmark first."
 msgstr "Selectaţi întâi un semn de carte."
 
-#: src/org/openstreetmap/josm/actions/DownloadAction.java:238
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
 msgid "Choose an area"
 msgstr "Alegeţi o zonă"
 
-#: 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 ""
 "Vă rog introduceţi coordonetele dorite sau faceţi clic pe un semn de carte."
 
-#: 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 "Vă rog selectaţi cel puţin un segment."
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr "Părăsiţi aplicaţia."
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "Despre"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Afişează ecranul cu informaţii despre program."
 
-#: 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 Versiunea {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 "ultima modificare la {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 Versiunea {0}"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Pagina pricipală"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Rapoarte erori"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
 #, fuzzy
 msgid "News about JOSM"
 msgstr "Despre 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 "Informaţii"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Citeşte-mă"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revizia"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribuţii"
 
-#: src/org/openstreetmap/josm/actions/AboutAction.java:85
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
 msgid "About JOSM..."
 msgstr "Despre 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 "Fişierul nu a putut fi găsit."
 
-#: 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 "Nu este nici un document deschis, nu este nimic de salvat."
 
-#: 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 "Acest document nu conţine date. Salvez oricum?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "Empty document"
 msgstr "Document gol"
 
-#: 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 "
@@ -433,39 +515,39 @@
 "ca şi cum aţi refuzat totul. Continui?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid "Conflicts"
 msgstr "Conflicte"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "File exists. Overwrite?"
 msgstr "Fişierul există. Îl suprascriu?"
 
-#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "Overwrite"
 msgstr "Suprascrie"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "date"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selecţie"
 
-#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr "strat"
 
-#: 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 "conflict"
 
-#: 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 "Scalare automată: {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)"
@@ -474,65 +556,76 @@
 "este mutată)"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save as"
+msgstr "Salvează"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+#, fuzzy
+msgid "Save the current data to a new file."
+msgstr "Salvează datele curente."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fişiere server OSM (.osm .xml)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "Fişiere GPX (.gpx)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fişiere CSV (.csv .txt)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Transmite la OSM"
 
-#: 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 "Trimite toate schimbările la serverul OSM."
 
-#: 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 "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: 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 "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Transmit datele"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:97
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
 msgid "Objects to add:"
 msgstr "Obiecte de adăugat:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:114
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Objects to modify:"
 msgstr "Obiecte de modificat:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:122
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
 msgid "Objects to delete:"
 msgstr "Obiecte de şters:"
 
-#: src/org/openstreetmap/josm/actions/UploadAction.java:129
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
 msgid "Upload this changes?"
 msgstr "Transmit aceste schimbări?"
 
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
-msgid "OSM Server Files (.osm .xml)"
-msgstr "Fişiere server OSM (.osm .xml)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-msgid "GPX Files (.gpx)"
-msgstr "Fişiere GPX (.gpx)"
-
-#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-msgid "CSV Files (.csv .txt)"
-msgstr "Fişiere CSV (.csv .txt)"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo"
-msgstr "Refă"
-
-#: src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refă ultima acţiune anulată."
-
-#: 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 "Ajutor"
+
+#: ../../../../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
 #, fuzzy, java-format
 msgid "Downloading {0} segment"
@@ -542,204 +635,124 @@
 msgstr[2] "Descarc {0} {1}"
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr "Nu au fost importate date."
-
-#: 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 "Strat de date"
-
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
 msgid "Download incomplete objects"
 msgstr "Descarcă obiecte incomplete"
 
-#: 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 "Descarcă toate căile incomplete (selectate) de pe serverul OSM."
 
-#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
-#, java-format
-msgid "Download {0} ways containing a total of {1} segments?"
-msgstr "Descarc {0} căi conţinând în total {1} segmente?"
-
-#: 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 "Vă rog selectaţi o culoare."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#, fuzzy, java-format
+msgid "Download {0} incomplete ways?"
+msgstr "Descarcă obiecte incomplete"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
 msgid "Download?"
 msgstr "Descarc?"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refă"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refă ultima acţiune anulată."
+
+#: ../../../../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 ""
+"Notă: GPL nu este compatibilă cu licenţa OSM. Nu transmiteţi piste "
+"licenţiate GPL"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export to GPX"
+msgstr "Exportă GPX"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+msgid "Export the data to GPX file."
+msgstr "Exportă datele într-un fişier GPX."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+msgid "Nothing to export. Get some data first."
+msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "gps track description"
+msgstr "descrierea pistei gps"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+msgid "Add author information"
+msgstr "Adaugă informaţii despre autor"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+msgid "Real name"
+msgstr "Nume real"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+msgid "Email"
+msgstr "Email"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+msgid "Copyright (URL)"
+msgstr "Drepturi de autor (adresă)"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+msgid "Predefined"
+msgstr "Predefinit"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+msgid "Copyright year"
+msgstr "An drepturi de autor"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+msgid "Keywords"
+msgstr "Cuvinte cheie"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+msgid "Export options"
+msgstr "Opţiuni exportare"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Eroare la exportarea {0}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+msgid "Error"
+msgstr "Eroare"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+msgid "Choose a predefined license"
+msgstr "Alegeţi o licenţă predefinită"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save"
 msgstr "Salvează"
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
 msgid "Save the current data."
 msgstr "Salvează datele curente."
 
-#: 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 "Formatul CSV nu este încă suportat."
 
-#: src/org/openstreetmap/josm/actions/SaveAction.java:61
+#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
 msgid "Unknown file extension."
 msgstr "Extensie fişier necunoscută."
 
-#: 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 "A intervenit o eroare în timpul salvării."
 
-#: 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 ""
-"Notă: GPL nu este compatibilă cu licenţa OSM. Nu transmiteţi piste "
-"licenţiate GPL"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export to GPX"
-msgstr "Exportă GPX"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
-msgid "Export the data to GPX file."
-msgstr "Exportă datele într-un fişier GPX."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51
-msgid "Nothing to export. Get some data first."
-msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-msgid "gps track description"
-msgstr "descrierea pistei gps"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81
-msgid "Add author information"
-msgstr "Adaugă informaţii despre autor"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-msgid "Real name"
-msgstr "Nume real"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88
-msgid "Email"
-msgstr "Email"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:92
-msgid "Copyright (URL)"
-msgstr "Drepturi de autor (adresă)"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:96
-msgid "Predefined"
-msgstr "Predefinit"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98
-msgid "Copyright year"
-msgstr "An drepturi de autor"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106
-msgid "Keywords"
-msgstr "Cuvinte cheie"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110
-msgid "Export options"
-msgstr "Opţiuni exportare"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid "Error while exporting {0}"
-msgstr "Eroare la exportarea {0}"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
-msgid "Error"
-msgstr "Eroare"
-
-#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185
-msgid "Choose a predefined license"
-msgstr "Alegeţi o licenţă predefinită"
-
-#: 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 "Descarc date"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-#, fuzzy
-msgid "Raw GPS data"
-msgstr "Descarc date GPS"
-
-#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr "Descarc date GPS"
-
-#: 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 "Nu am putut citi \"{0}\""
-
-#: 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 "Nu am putut detecta şirul de format al datelor."
-
-#: 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 "Uneşte stratul selectat cu stratul imediat inferior."
-
-#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
-#, fuzzy
-msgid "Please select at least four nodes."
-msgstr "Vă rog selectaţi cel puţin un segment."
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
-msgid "Rename layer"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
-msgid "Also rename the file"
-msgstr ""
-
-#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
-#, fuzzy, java-format
-msgid "Could not rename the file \"{0}\"."
-msgstr "Nu am putut citi \"{0}\""
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save as"
-msgstr "Salvează"
-
-#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-#, fuzzy
-msgid "Save the current data to a new file."
-msgstr "Salvează datele curente."
-
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #, java-format
 msgid ""
@@ -749,13 +762,13 @@
 msgstr ""
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr "Raportează eroarea"
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occoured.\n"
@@ -769,9 +782,9 @@
 "versiune de JOSM, vă rog fiţi amabil şi trimiteţi un raport de eroare."
 
-#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr "Excepţie netratată"
 
-#: 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"
@@ -781,5 +794,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."
@@ -789,87 +802,61 @@
 "de"
 
-#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr "Ctrl-"
 
-#: 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 "A intervenit o eroare în timpul salvării."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Încarcă selecţia"
 
-#: 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 "Contactez {0}..."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Descarc..."
 
-#: 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 "Nu am putut citi de la adresa: \"{0}\""
 
-#: 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 "Eroare de prelucrare la adresa: \"{0}\""
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Selecţia curentă"
 
-#: 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 "Deschide o fereastra cu o listă de selecţie."
 
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-msgid "Select"
-msgstr "Selectaţi"
-
-#: 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 ""
-"Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
-"mai sus."
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr "Reîncarcă"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
-msgid "Refresh the selection list."
-msgstr "Reîncarcă lista de selecţii"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
-msgid "Search"
-msgstr "Căutare"
-
-#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search for objects."
-msgstr "Caută obiecte"
-
-#: 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 "Vă rog introduceţi un şir de căutat"
 
-#: 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 "
@@ -886,29 +873,33 @@
 "foot are orice valoare.</ul></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 "Înlocuieşte selecţia"
 
-#: 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 "adaugă la selecţie"
 
-#: 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 "elimină din selecţie"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
+msgid "Search"
+msgstr "Căutare"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr "Îmbin conflictele."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr "Rezolvă"
 
-#: 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 ""
@@ -916,59 +907,84 @@
 "mai sus."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid "Select"
+msgstr "Selectaţi"
+
+#: ../../../../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 ""
+"Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
+"mai sus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
 msgid "Please select something from the conflict list."
 msgstr "Vă rog selectaţi ceva din lista de conflicte."
 
-#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve Conflicts"
 msgstr "Rezolvare conflicte"
 
-#: 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 "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr "Reîncarcă"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Revert"
+msgstr "Anulează"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr "Istoric"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr "Afişează istoricul tuturor elementelor selectate."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
+msgid "Object"
+msgstr "Obiect"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr "Dată"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+
+#: ../../../../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 "Nu a fost încă implementat."
+
+#: ../../../../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 ""
+"Readu toate obiectele selectate curent la starea din versiunea selectată în "
+"lista de istoric."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Stivă comenzi"
 
-#: 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 "Deschide o listă cu toate comenzile (zonă tampon pentru anulare)."
 
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
-msgid "Delete the selected layer."
-msgstr "Şterge stratul selectat."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
-msgid "Show/Hide"
-msgstr "Arată/Ascunde"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Toggle visible state of the selected layer."
-msgstr "Comută starea vizibilă a stratului selectat."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Layers"
-msgstr "Straturi"
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
-msgid "Open a list of all loaded layers."
-msgstr "Deschide o listă cu toate straturile încărcate."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
-msgid "Move the selected layer one row up."
-msgstr "Mută stratul selectat un rând în sus."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
-msgid "Move the selected layer one row down."
-msgstr "Mută stratul selectat un rând în jos."
-
-#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
-msgid "Merge the selected layer into the layer directly below."
-msgstr "Uneşte stratul selectat cu stratul imediat inferior."
-
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
 #, fuzzy
 msgid "Please select the objects you want to change properties for."
 msgstr "Vă rog selectaţi rândul care va fi şters."
 
-#: 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."
@@ -978,5 +994,5 @@
 msgstr[2] "Se vor modifica {0} de obiecte."
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
 msgid ""
@@ -986,46 +1002,46 @@
 "cheia.)"
 
-#: 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 "Schimb valorile?"
 
-#: 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 "<diferit>"
 
-#: 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 ""
 
-#: 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 "Vă rog selectaţi o cheie"
 
-#: 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 "Vă rog selectaţi o valoare"
 
-#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: 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 "Proprietăţi ale obiectelor selectate."
 
-#: 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 "Nu am putut citi sursa prestabilită de adnotări: {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 "Eroare la prelucrarea {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"
@@ -1035,88 +1051,114 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: 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 "Cheie"
 
-#: 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 "Valoare"
 
-#: 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 "Vă rog selectaţi rândul care va fi editat."
 
-#: 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 "Vă rog selectaţi rândul care va fi şters."
 
-#: 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 "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: 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 "Editare"
 
-#: 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 "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: 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 "Şterge cheia selectată din toate obiectele"
 
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr "Anulează"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr "Istoric"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr "Afişează istoricul tuturor elementelor selectate."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: src/org/openstreetmap/josm/gui/MapStatus.java:224
-msgid "Object"
-msgstr "Obiect"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr "Dată"
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
-
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
-#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178
-msgid "Not implemented yet."
-msgstr "Nu a fost încă implementat."
-
-#: 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 ""
-"Readu toate obiectele selectate curent la starea din versiunea selectată în "
-"lista de istoric."
-
-#: 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 "Şterge stratul selectat."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+msgid "Show/Hide"
+msgstr "Arată/Ascunde"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Layers"
+msgstr "Straturi"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+msgid "Open a list of all loaded layers."
+msgstr "Deschide o listă cu toate straturile încărcate."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+msgid "Move the selected layer one row up."
+msgstr "Mută stratul selectat un rând în sus."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+msgid "Move the selected layer one row down."
+msgstr "Mută stratul selectat un rând în jos."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Uneşte stratul selectat cu stratul imediat inferior."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr "Tip necunoscut la linia {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 ""
+"Nu pot avea o listă de selecţie modificabilă cu valori implicite (linia {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}) şi values ({1}) trebuie să aibă acelaşi număr de "
+"elemente."
+
+#: ../../../../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"
+msgstr[2] "de 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 "Obiect adnotare {0} necunoscut la linia {1} coloana {2}"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Modificare proprietăţi"
+
+#: ../../../../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"
@@ -1125,7 +1167,7 @@
 msgstr[2] "de noduri"
 
-#: 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"
@@ -1134,7 +1176,7 @@
 msgstr[2] "de segmente"
 
-#: 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"
@@ -1143,23 +1185,23 @@
 msgstr[2] "de căi"
 
-#: 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 "Au existat conflicte în timpul importului."
 
-#: 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} constă în:"
 
-#: 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} şters.)"
 
-#: 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 "Converteşte la strat de date"
 
-#: 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"
@@ -1168,5 +1210,5 @@
 msgstr[2] "de urme"
 
-#: 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"
@@ -1175,5 +1217,5 @@
 msgstr[2] "de puncte"
 
-#: 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"
@@ -1183,5 +1225,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, fuzzy, java-format
 msgid "{0} consists of {1} track"
@@ -1191,5 +1233,5 @@
 msgstr[2] "{0} format din {1} urmă"
 
-#: 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"
@@ -1199,110 +1241,110 @@
 msgstr[2] "{0} de puncte"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 #, fuzzy
 msgid "Customize line drawing"
 msgstr "Personalizează culoarea"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 #, fuzzy
 msgid "Use global settings."
 msgstr "Configurări afişare"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 #, fuzzy
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte gps neprelucrate"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 #, fuzzy
 msgid "Do not draw lines between points for this layer."
 msgstr "Trasează linii între puncte gps neprelucrate"
 
-#: 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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
 msgid "Customize Color"
 msgstr "Personalizează culoarea"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "OK"
 msgstr "OK"
 
-#: 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 "Renunţă"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "Default"
 msgstr "Implicit"
 
-#: 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 "Alegeţi o culoare"
 
-#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: 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 "Imagine JPEG (*.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 ""
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr "Citire 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 "Nu există timp pentru punctul {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 "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
 
-#: 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 "Nu am găsit imagini cu mărci de timp citibile."
 
-#: 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 "Citesc {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 "Imagini geoetichetate"
 
-#: 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 "Start GPS: {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 "Sfârşit GPS: {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 "diferentă curentă: {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 "diferenţă zonă de timp: "
 
-#: 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"
@@ -1311,62 +1353,62 @@
 msgstr[2] "de imagini"
 
-#: 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} în urmă."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr "Sincronizare ceas"
 
-#: 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 "Datele din fişierul \"{0}\" nu au putut fi interpretate."
 
-#: 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 "Nu există timp EXIF în fişierul \"{0}\"."
 
-#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr "Imagine"
 
-#: 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 "Introduceţi data afişată (ll/zz/aaaa 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 "Zona de timp a unităţii GPS (diferenţă faţă de fotografie)"
 
-#: 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 "Sincronizare timp cu unitatea GPS"
 
-#: 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 "Timpul introdus nu a putut fi interpretat."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:74
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
 msgid "Could not read bookmarks."
 msgstr "Nu am putut citi semnele de carte."
 
-#: src/org/openstreetmap/josm/gui/BookmarkList.java:98
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
 msgid "Could not write bookmark."
 msgstr "Nu am putut scrie semnele de carte."
 
-#: 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 Open Street Map - 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 "stratul nu este în listă."
 
-#: 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 ""
@@ -1374,69 +1416,69 @@
 "server."
 
-#: 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 "Există modificăre nesalvate. Într-adevăr ieşiţi?"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:56
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
 msgid "Unsaved Changes"
 msgstr "Modificări nesalvate"
 
-#: 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 "utilizare"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "options"
 msgstr "opţiuni"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: 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 "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=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 "Deschide fişierul (ca gps brut, dacă .gpx sau .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 "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: 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 "Selectează cu căutarea dată"
 
-#: 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 "Nu porni pe întreg ecranul"
 
-#: 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 "Restabileşte preferinţele implicite"
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Set the language. Example: "
 msgstr "Precizează limba. Exemplu: "
 
-#: src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "examples"
 msgstr "exemple"
 
-#: 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"
@@ -1447,13 +1489,29 @@
 "că aţi încărcat date înainte de --selection"
 
-#: 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 "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
 
-#: src/org/openstreetmap/josm/gui/MapStatus.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
+msgid "Layer"
+msgstr "Strat"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
+msgid "Files"
+msgstr "Fişiere"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
+msgid "Connection"
+msgstr "Conexiune"
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+msgid "Contacting the OSM server..."
+msgstr "Contactez serverul OSM..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
 
-#: 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:"
@@ -1463,50 +1521,50 @@
 msgstr[2] "{0} de obiecte au conflicte:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr "versiunea mea:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr "versiunea lor:"
 
-#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr "rezolvat în versiunea:"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
 msgid "Error while parsing"
 msgstr "Eroare la prelucrare"
 
-#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
 msgid "File Not found"
 msgstr "Fişierul nu a fost găsit"
 
-#: 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 "şir"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr "Numele utilizatorului."
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr "Parola OSM."
 
-#: 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 ""
 "Dimensionează aplicaţia la geometria precizată (format: LĂŢIMExÎNĂLŢIME)"
 
-#: 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 "şir;şir;..."
 
-#: 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 "
@@ -1516,5 +1574,5 @@
 "lat=y&lon=x&zoom=z sau un nume de fişier"
 
-#: 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 "
@@ -1524,5 +1582,5 @@
 "conţinând lat=x&lon=y&zoom=z sau un nume de fişier"
 
-#: 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 "
@@ -1532,43 +1590,43 @@
 "google sau o adresă care întoarce osm-xml"
 
-#: src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr "oricare"
 
-#: 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 "Dacă este specificat, resetează configuraţia în loc de a o citi."
 
-#: 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 "Nume utilizator"
 
-#: 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 "Parolă"
 
-#: 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 "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
 
-#: 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 "Trasează linii între puncte gps neprelucrate"
 
-#: 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 "Forţează linii dacă nu a fost importat nici un segment."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
 msgid "Draw large GPS points."
 msgstr "Desenează puncte GPS mari."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
 msgid "Draw Direction Arrows"
 msgstr "Desenează săgeţi direcţionale"
 
-#: 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."
@@ -1577,47 +1635,47 @@
 "despre linii."
 
-#: 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 "Desenează puncte mai pari pentru punctele GPS."
 
-#: 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 "Desenează indicii despre direcţie pentru toate segmentele."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 msgid "Color"
 msgstr "Culoare"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
 msgid "Name"
 msgstr "Nume"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
 msgid "Choose"
 msgstr "Alegeţi"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select a color."
 msgstr "Vă rog selectaţi o culoare."
 
-#: 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 "Alegeţi o culoare pentru {0}"
 
-#: 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 "Sursă predefinită de adnotări"
 
-#: 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 "Adresa de bază pentru serverul OSM (API REST)"
 
-#: 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 "Nume autentificare (email) pentru contul OSM."
 
-#: 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."
@@ -1626,9 +1684,9 @@
 "nici o parolă."
 
-#: 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 "Adresa de bază a serverului pentru obţinerea imaginilor WMS de fundal."
 
-#: 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</"
@@ -1647,5 +1705,5 @@
 "virgulă.</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 "
@@ -1655,9 +1713,9 @@
 "pentru a desena linii pe cale."
 
-#: 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 "Culori utilizate de diferite obiecte în JOSM."
 
-#: 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 "
@@ -1667,17 +1725,17 @@
 "Vedeţi http://josm.eigenheimstrasse.de/wiki/AnnotationPresets pentru ajutor."
 
-#: 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 "Adaugă o nouă sursă de adnotări predefinite la listă."
 
-#: 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 "Şterge sursele selectate din listă."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
 msgid "Display Settings"
 msgstr "Configurări afişare"
 
-#: 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 "
@@ -1687,37 +1745,33 @@
 "program."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
 msgid "Look and Feel"
 msgstr "Aspect"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431
-msgid "Language"
-msgstr "Limbă"
-
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Colors"
 msgstr "Culori"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Connection Settings"
 msgstr "Configurări conexiune"
 
-#: 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 "Configurări conexiune la serverul OSM."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Base Server URL"
 msgstr "Adresă server principal"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:448
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
 msgid "OSM username (email)"
 msgstr "Nume utilizator OSM (email)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
 msgid "OSM password"
 msgstr "Parola OSM"
 
-#: 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."
@@ -1729,149 +1783,109 @@
 "adresă.<br><b>Nu folosiţi o parolă importantă.</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 ""
 "Specificaţie pentru import CSV (gol: citeşte din prima linie a datelor)"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
 msgid "Map Settings"
 msgstr "Opţiuni hartă"
 
-#: 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 "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
 msgid "Projection method"
 msgstr "Metodă de proiecţie"
 
-#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470
+#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Annotation preset sources"
 msgstr "Surse de adnotări predefinite"
 
-#: 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 "Tip necunoscut la linia {0}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-"Nu pot avea o listă de selecţie modificabilă cu valori implicite (linia {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}) şi values ({1}) trebuie să aibă acelaşi număr de "
-"elemente."
-
-#: 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"
-msgstr[2] "de elemente"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr "Obiect adnotare {0} necunoscut la linia {1} coloana {2}"
-
-#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Modificare proprietăţi"
-
-#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
-msgid "Contacting the OSM server..."
-msgstr "Contactez serverul OSM..."
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41
-msgid "Conflicts in disjunct objects"
-msgstr "Conflicte în obiecte disjuncte"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59
-#, java-format
-msgid "Downloading {0} {1}"
-msgstr "Descarc {0} {1}"
-
-#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66
-msgid "Got more than one object when expecting only one."
-msgstr "Am primit mai mult de un obiect când mă aşteptam doar la unul."
-
-#: 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 "Descarc punctele {0} până la {1}..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
+msgid "Downloading OSM data..."
+msgstr "Descarc datele OSM..."
+
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
 msgid "Unknown version"
 msgstr "Versiune necunoscută"
 
-#: 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 "Am găsit eticheta <seg> pe o non-cale."
 
-#: 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 "Segment incomplet cu 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 "Excepţie pointer nul. Posibil lipsesc nişte etichete."
 
-#: 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 "Obiect ilegal cu 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 "Nu am putut citi formatul de timp \"{0}\"."
 
-#: 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 "Lipseşte atributul necesar \"{0}\"."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
 msgid "Preparing data..."
 msgstr "Pregătesc datele..."
 
-#: src/org/openstreetmap/josm/io/OsmReader.java:222
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
 msgid "Illformed Node id"
 msgstr "Note id malformat"
 
-#: 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 "Transmit {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 "Gazdă necunoscută"
 
-#: 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 "Eroare date: valoarea lat \"{0}\" este în afara limitelor."
 
-#: 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 "Eroare date: valoarea lon \"{0}\" este în afara limitelor."
 
-#: 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 "Nu am putut detecta şirul de format al datelor."
 
-#: 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 "
@@ -1881,5 +1895,5 @@
 "să precizaţi manual un şir de format în Preferinţe."
 
-#: 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"
@@ -1888,96 +1902,97 @@
 "şi 'lon'"
 
-#: 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 "Tip de date necunoscut: \"{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 "Puteţi să adăugaţi un şir de format în preferinţe."
 
-#: 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 "Eroare de prelucrare la linia {0}"
 
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Descarc punctele {0} până la {1}..."
-
-#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr "Descarc datele OSM..."
-
-#: src/org/openstreetmap/josm/io/OsmConnection.java:67
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
 msgid "Incorrect password or username."
 msgstr "Parolă sau nume utilizator incorecte."
 
-#: 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 "Atenţie: Parola este transferată necriptată."
 
-#: 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 "Salvează nume utilizator şi parolă (necriptate)"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: src/org/openstreetmap/josm/io/OsmConnection.java:116
+#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
 msgid "Aborting..."
 msgstr "Anulez..."
 
-#: 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 "Eroare la prelucrare."
 
-#: src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
 msgid "position"
 msgstr "poziţie"
 
-#: src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
 msgid "different"
 msgstr "diferit"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr "şters"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr "adevărat"
 
-#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr "fals"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr "nici unul"
 
-#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr "segmente"
 
-#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr "la"
 
-#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr "de la"
 
-#: 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 "nou"
 
-#: 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 "necunoscut"
 
-#: 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"
@@ -1987,52 +2002,52 @@
 msgstr[2] "{0} de noduri"
 
-#: 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 "incomplet"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:134
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "background"
 msgstr "fundal"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:138
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "incomplete way"
 msgstr "cale incompletă"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:139
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "selected"
 msgstr "selectat"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:140
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140
 msgid "gps point"
 msgstr "punct gps"
 
-#: src/org/openstreetmap/josm/data/Preferences.java:142
+#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
 msgstr "scală"
 
-#: 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 "Rezolvă {0} conflicte în {1} obiecte"
 
-#: src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr "Schimbă"
 
-#: src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr "Secvenţă"
 
-#: 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 "Elimină \"{0}\" pentru"
 
-#: 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 "Stabileşte {0}={1} pentru"
 
-#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -2041,61 +2056,89 @@
 msgstr[2] "de obiecte"
 
-#: src/org/openstreetmap/josm/plugins/PluginException.java:17
-#, fuzzy, java-format
-msgid "An error occoured in plugin {0}"
-msgstr "A intervenit o eroare în timpul salvării."
-
-#: src/org/openstreetmap/josm/Main.java:176
-msgid "You have to specify annotation sources in the preferences first."
-msgstr "Mai întâi trebuie să specificaţi surse de adnotări în preferinţe."
-
-#: src/org/openstreetmap/josm/Main.java:183
-msgid "Annotation Preset Tester"
-msgstr "Tester de adnotări predefinite"
-
-#: src/org/openstreetmap/josm/Main.java:195
-msgid "Files"
-msgstr "Fişiere"
-
-#: src/org/openstreetmap/josm/Main.java:206
-msgid "Connection"
-msgstr "Conexiune"
-
-#: src/org/openstreetmap/josm/Main.java:213
-msgid "Layer"
-msgstr "Strat"
-
-#: src/org/openstreetmap/josm/Main.java:234
-msgid "Help"
-msgstr "Ajutor"
-
-#: 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 "Nu am putut citi \"{0}\""
 
-#: src/org/openstreetmap/josm/Main.java:293
+#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228
 msgid "unnamed"
 msgstr "fără nume"
 
-#: 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 "Proiecţia nu a putut fi citită din preferinte. Folosesc EPSG: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 "Ignor adresa malformată: \"{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 "Ignor adresa malformată către fişier: \"{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 "Descarcă şi afişează imagini landsat pe fundal."
+
+#: ../landsat/src/landsat/LandsatLayer.java:45
+#, fuzzy
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+"Eroare la transformarea longitudinii pentru cache-ul de imagini. Nu pot "
+"opera pe {0}"
+
+#: ../landsat/src/landsat/LandsatLayer.java:70
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "Stratul WMS: {0}"
+
+#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20
+msgid "Annotation Preset Tester"
+msgstr "Tester de adnotări predefinite"
+
+#: ../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 "Mai întâi trebuie să specificaţi surse de adnotări în preferinţe."
+
+#~ msgid "Download {0} ways containing a total of {1} segments?"
+#~ msgstr "Descarc {0} căi conţinând în total {1} segmente?"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Reîncarcă lista de selecţii"
+
+#~ msgid "Search for objects."
+#~ msgstr "Caută obiecte"
+
+#~ msgid "Language"
+#~ msgstr "Limbă"
+
+#~ msgid "Conflicts in disjunct objects"
+#~ msgstr "Conflicte în obiecte disjuncte"
+
+#~ msgid "Downloading {0} {1}"
+#~ msgstr "Descarc {0} {1}"
+
+#~ msgid "Got more than one object when expecting only one."
+#~ msgstr "Am primit mai mult de un obiect când mă aşteptam doar la unul."
+
 #~ msgid "Used in a way."
 #~ msgstr "Folosit într-o cale."
@@ -2110,7 +2153,4 @@
 #~ msgstr "Arată fundalul"
 
-#~ msgid "Download and show landsat background images."
-#~ msgstr "Descarcă şi afişează imagini landsat pe fundal."
-
 #~ msgid "Images"
 #~ msgstr "Imagini"
@@ -2118,10 +2158,2 @@
 #~ msgid "Time loop in gps data."
 #~ msgstr "Buclă de timp în datele gps."
-
-#~ msgid "Wrong longitude transformation for tile cache. Can't operate on {0}"
-#~ msgstr ""
-#~ "Eroare la transformarea longitudinii pentru cache-ul de imagini. Nu pot "
-#~ "opera pe {0}"
-
-#~ msgid "WMS layer: {0}"
-#~ msgstr "Stratul WMS: {0}"
