Index: /build.xml
===================================================================
--- /build.xml	(revision 132)
+++ /build.xml	(revision 133)
@@ -83,4 +83,7 @@
     		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -len_GB ${po}/en_GB.po"/>
     	</exec>
+    	<exec executable="msgfmt">
+    		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lro ${po}/ro.po"/>
+    	</exec>
     </target>
 
Index: /po/de.po
===================================================================
--- /po/de.po	(revision 132)
+++ /po/de.po	(revision 133)
@@ -14,5 +14,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-28 19:41+0200\n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
 "PO-Revision-Date: 2006-07-28 20:16+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -24,109 +24,111 @@
 "X-Generator: KBabel 1.9.1\n"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
 msgid "Add segment"
 msgstr "Abschnitt hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
 msgid "Add a segment between two nodes."
 msgstr "Abschnitt zwischen zwei Knotenpunkten hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
-#: /home/sven/svn/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: /home/sven/svn/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
 msgid "Delete"
 msgstr "Löschen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
 msgid "Delete nodes, streets or segments."
 msgstr "Lösche Knotenpunkte, Straßen oder Abschnitte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
 msgid "Cannot delete node."
 msgstr "Kann den Knotenpunkt nicht löschen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
 msgid "This object is in use."
 msgstr "Das Objekt wird benutzt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
 msgid "Used by more than two segments."
 msgstr "Wird bei mehr als zwei Abschnitten benutzt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
 msgid "Used by only one segment."
 msgstr "Wird bei einen Abschnitt benutzt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
 msgid "Used in a way."
 msgstr "Wird in einem Weg benutzt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
 msgid "Wrong direction of segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Schlüsselkonflikt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
 msgid "Delete Node"
 msgstr "Knotenpunkt löschen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
 msgstr "Zoom"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: /home/imi/src/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,+,-)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
 msgid "Selection"
 msgstr "Auswahl"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
 msgid "Select objects by dragging or clicking."
 msgstr "Wähle Objekte durch ziehen oder klicken."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Straight line"
 msgstr "Verbundene Linie"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects in a straight line."
 msgstr "Wähle Objekte in einer Reihe."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:51
-#: /home/sven/svn/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "Move"
 msgstr "Verschieben"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
 msgid "Move selected objects around."
 msgstr "Verschiebe markierte Objekte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Weg hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
-msgid "Warning: This way is incomplete. Try to download it, before adding segments."
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+msgid ""
+"Warning: This way is incomplete. Try to download it, before adding segments."
 msgstr ""
 "Achtung: Dieser Weg ist nicht vollständig. Er sollte vom Server geladen "
 "werden, bevor Abschnitte hinzugefügt werden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -145,25 +147,26 @@
 "Sollen alle Abschnitte zu dem Wegen hinzugefügt werden?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr "Abschnitte eines Weges hinzufügen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: /home/imi/src/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?"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+msgstr ""
+"Sollen die gewählten Abschnitte zu dem ausgewählten Weg hinzugefügt werden?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr "Abschnitte zum Weg hinzufügen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr "Alle Abschnitte neu anordnen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr "Neu Anordnen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -172,122 +175,122 @@
 msgstr[1] "Soll ein neuer Weg aus {0} Abschnitten erstellt weden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 msgid "Create new way"
 msgstr "Neuen Weg erstellen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add a new node to the map"
 msgstr "Fügt einen neuen Knotenpunkt zur Karte hinzu"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node into segment"
 msgstr "Knotenpunkt in einen Abschnitt einfügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add a node into an existing segment"
 msgstr "Fügt einen Knotenpunkt in einen bestehenden Abschnitt ein"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
 msgid "Can not add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
 msgid "Add Node into Segment"
 msgstr "Einen Knotenpunkt in einen Abschnitt einfügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 msgid "Reverse Segments"
 msgstr "Richtung ändern"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 msgid "Revert the direction of all selected Segments."
 msgstr "Richtung der ausgewählten Abschnitte umdrehen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
 msgid "Open a preferences page for global settings."
 msgstr "öffnete eine Globale Einstellungs-Seite."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Öffnen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr "Datei öffnen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:73
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
 #, java-format
 msgid "Unknown file extension: {0}"
 msgstr "Dateiendung unbekannt: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:79
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:63
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:63
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 msgid "Data Layer"
 msgstr "Daten-Ebene"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Parsen. {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
 msgid "Downloading data"
 msgstr "Lade Daten aus dem Internet"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:80
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:80
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:59
 msgid "No data imported."
 msgstr "Keine Daten importiert."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
 msgid "Open as raw gps data"
 msgstr "Als GPS-Daten öffnen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
 msgid "Download from OSM"
 msgstr "Von OSM laden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM Server laden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:140
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:140
 msgid ""
 "Move and zoom the image like the main map. Select an area to download by "
@@ -297,158 +300,159 @@
 "ladenden Bereich durch einfügen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:143
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
 msgid "Bounding box"
 msgstr "Zeichen-Box"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
 msgid "min lat"
 msgstr "min Breite"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
 msgid "min lon"
 msgstr "min Länge"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:148
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
 msgid "max lat"
 msgstr "max Breite"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:150
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
 msgid "max lon"
 msgstr "max Länge"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
 msgid "URL from www.openstreetmap.org"
 msgstr "URL von www.openstreetmap.org"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:215
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
-#: /home/sven/svn/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
 msgid "Please enter the desired coordinates first."
 msgstr "Bitte wählen Sie zuerst die Koordinaten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:240
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
 msgid "Please enter a name for the location."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:248
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
 msgid "Remove"
 msgstr "Entfernen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie ein Lesezeichen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:271
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
 msgid "Choose an area"
 msgstr "Bereich auswählen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadAction.java:286
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
 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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgstr ""
+"Bitte geben Sie die Koordinaten an oder wählen Sie eine Lesezeichen aus."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Beenden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr "Beende das Programm."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "Über"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java  Version {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Webseite"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Fehler melden:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:76
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
 msgid "Revision"
 msgstr "Version"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Contribution"
 msgstr "Mitwirkung"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AboutAction.java:93
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert. Überschreiben?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "Daten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "Auswahl"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr "Ebene"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "conflict"
 msgstr "Konflikt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
 #, java-format
 msgid "Auto Scale: {0}"
 msgstr "Automatisch skalieren: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
 #, java-format
 msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
@@ -457,65 +461,65 @@
 "bewegt wird)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Zum OSM speichern"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload all changes to the OSM server."
 msgstr "Kartendaten zum OSM Server speichern"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:41
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:46
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:75
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Sende Daten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "No changes to upload."
 msgstr "Kann keine Änderungen speichern."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:116
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/UploadAction.java:131
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
 msgid "Upload this changes?"
 msgstr "Diese Änderungen vornehmen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
 msgid "OSM Server Files (.osm .xml)"
 msgstr "OSM Server Dateien (.osm .xml)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "GPX Files (.gpx)"
 msgstr "GPX Dateien (.gpx)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 msgid "CSV Files (.csv .txt)"
 msgstr "CSV Dateien (.csv .txt)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo the last undone action."
 msgstr "Wiederhole die letzte zurückgenommene Aktion."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
 #, java-format
 msgid "Downloading {0} segments"
@@ -524,56 +528,56 @@
 msgstr[1] "Hole Abschnitt {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
 msgid "Download incomplete objects"
 msgstr "Unvollständige Objekte nachladen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr "Alle (ausgewählten) unvollständigen Wege vom OSM Server laden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
 #, java-format
 msgid "Download {0} ways containing a total of {1} segments?"
 msgstr "Lade {0} Wege, die aus {1} Abschnitten bestehen?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
 msgid "Download?"
 msgstr "Daten laden?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
 msgid "Show background"
 msgstr "Hintergrund anzeigen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
 msgid "Download and show landsat background images."
 msgstr "Lade und zeige Satelietenbilder als Hintergrund."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
 msgid "Not implemented yet."
 msgstr "Noch nicht fertig."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
 msgid "Save"
 msgstr "Speichern"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
 msgid "Save the current data."
 msgstr "Speichere die aktuellen Daten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
 msgid "The document contains no data. Save anyway?"
 msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -583,21 +587,21 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
 msgid "CSV output not supported yet."
 msgstr "CSV Ausgabe ist noch nicht möglich."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/SaveAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
 msgid "An error occoured while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:39
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:39
 msgid ""
 "Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
@@ -607,74 +611,74 @@
 "GPL  stehen hoch-spielen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid "Export to GPX"
 msgstr "In GPX exportieren"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
 msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "gps track description"
 msgstr "GPS Track-Beschreibung"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
 msgid "Add author information"
 msgstr "Information zum Autor hinzufügen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
 msgid "Real name"
 msgstr "Voller Name"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
 msgid "Email"
 msgstr "E-Mail"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
 msgid "Predefined"
 msgstr "Vordefiniert"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
 msgid "Copyright year"
 msgstr "Jahr des Copyrights"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
 msgid "Export options"
 msgstr "Export-Einstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
 #, java-format
 msgid "Error while exporting {0}"
 msgstr "Fehler beim exportieren von. {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
 msgid "Error"
 msgstr "Fehler"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
 msgid "Choose a predefined license"
 msgstr "Wähle eine vordefinierte Lizenz"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
 msgid "Do nothing"
 msgstr "Nichts tun"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
 msgid "Report Bug"
 msgstr "Fehler melden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:40
 msgid ""
 "An unexpected exception occoured.\n"
@@ -689,9 +693,9 @@
 "uns den Fehler als \"Bug Report\"."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
 msgid "Unexpected Exception"
 msgstr "Unerwarteter Fehler"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "Please send this to josm@eigenheimstrasse.de\n"
@@ -701,5 +705,5 @@
 "\n"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "Please send an email with the following information to josm@eigenheimstrasse."
@@ -709,145 +713,87 @@
 "josm@eigenheimstrasse.de"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr "Strg-"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
 msgid "Alt-"
 msgstr "Alt-"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
 msgid "AltGr-"
 msgstr "AltGr-"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
 msgid "Shift-"
 msgstr "Shift-"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
-msgid "Click Reload to refresh list"
-msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+msgid "Load Selection"
+msgstr "Lade Auswahl"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#, java-format
+msgid "Contact {0}..."
+msgstr "Verbinde zu {0} ..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+msgid "Downloading..."
+msgstr "Lade Daten ..."
+
+#: /home/imi/src/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"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+msgid "Current Selection"
+msgstr "Aktuelle Auswahl"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+msgid "Open a selection list window."
+msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Select"
+msgstr "Wähle aus"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Revert"
-msgstr "Zücknehmen"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
-msgid "History"
-msgstr "Geschichte"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
-msgid "Display the history of all selected items."
-msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Object"
-msgstr "Objekt"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
-msgid "Date"
-msgstr "Datum"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
-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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Conflict"
-msgstr "Konflikt"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
-msgid "Merging conflicts."
-msgstr "Konflikte lösen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
-msgid "Resolve"
-msgstr "Lösen"
-
-#: /home/sven/svn/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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-msgid "Select"
-msgstr "Wähle aus"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
-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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
-msgid "Please select something from the conflict list."
-msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-msgid "Resolve Conflicts"
-msgstr "Konflikte entfernen"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
-msgid "Load Selection"
-msgstr "Lade Auswahl"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
-#, java-format
-msgid "Contact {0}..."
-msgstr "Verbinde zu {0} ..."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
-msgid "Downloading..."
-msgstr "Lade Daten ..."
-
-#: /home/sven/svn/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"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
-#, java-format
-msgid "Parsing error in url: \"{0}\""
-msgstr "Kann die URL \"{0}\" nicht parsen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Current Selection"
-msgstr "Aktuelle Auswahl"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
-msgid "Open a selection list window."
-msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Auswahlliste aktualisieren."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
 msgid "Search"
 msgstr "Suche"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Objekte suchen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Please enter a search string."
 msgstr "Bitte geben Sie einen Suchbegriff ein."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -865,58 +811,83 @@
 "html>"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr "Konflikt"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr "Konflikte lösen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Lösen"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+msgid "Please select something from the conflict list."
+msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+msgid "Resolve Conflicts"
+msgstr "Konflikte entfernen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Befehlsliste"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
 msgid "Delete the selected layer."
 msgstr "Ausgewählte Ebene löschen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
 msgid "Show/Hide"
 msgstr "Zeigen/Verstecken"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+#: /home/imi/src/josm/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Layers"
 msgstr "Ebenen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Open a list of all loaded layers."
 msgstr "Öffnet eine Liste alle geladenen Ebenen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
+#: /home/imi/src/josm/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"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
+#: /home/imi/src/josm/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
+#: /home/imi/src/josm/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 #, java-format
 msgid "This will change {0} object."
@@ -925,49 +896,50 @@
 msgstr[1] "Dies wird {0} Objekte ändern."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
-#, java-format
-msgid "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
 msgstr ""
 "Bitte geben Sie einen neuen Wert für \"{0}\" an.<br>(Leereingabe löscht den "
 "Eintrag.)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
 msgid "Change values?"
 msgstr "Wert ändern?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 msgid "<different>"
 msgstr "<verschieden>"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Properties"
 msgstr "Einstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Property for selected objects."
 msgstr "Einstellungen der Ausgewählten Objekte."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
 #, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Kann die voreingestellte Quelle nicht laden: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Parsen. {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, java-format
 msgid "Change {0} object"
@@ -976,46 +948,83 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Schlüssel"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Wert"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select the row to edit."
 msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die löschende Zeile."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
 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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:193
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte ändern"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
 msgid "Delete the selected key in all objects"
 msgstr "Den Schlüssel aus allen Objekten löschen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:132
-#: /home/sven/svn/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr "\"Neu Laden\" anklicken um die Liste zu aktualisieren."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Revert"
+msgstr "Zücknehmen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr "Geschichte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr "Die Geschichte aller ausgewählten Elemente ansehen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Objekt"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr "Datum"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle gewählten Objekte neu laden und die Liste neu aufbauen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "node"
 msgid_plural "nodes"
@@ -1023,7 +1032,7 @@
 msgstr[1] "Knotenpunkte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
 msgid "segment"
 msgid_plural "segments"
@@ -1031,7 +1040,7 @@
 msgstr[1] "Abschnitte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "way"
 msgid_plural "ways"
@@ -1039,23 +1048,23 @@
 msgstr[1] "Wege"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
 msgid "There were conflicts during import."
 msgstr "Es gab Konflikte beim Importieren.w"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
 #, java-format
 msgid " ({0} deleted.)"
 msgstr "({0} gelöscht)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
 msgid "track"
 msgid_plural "tracks"
@@ -1063,5 +1072,5 @@
 msgstr[1] "Tracks"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
 msgid "point"
 msgid_plural "points"
@@ -1069,5 +1078,5 @@
 msgstr[1] "Punkte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
 #, java-format
 msgid "a track with {0} point"
@@ -1076,10 +1085,10 @@
 msgstr[1] "Ein Track mit {0} Punkten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} consists of {1} track"
 msgstr "{0} besteht aus {1} Tracks"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} point"
@@ -1088,89 +1097,89 @@
 msgstr[1] "{0} Punkte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "OK"
 msgstr "Okay"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG Bilder (*.jpg)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
 msgid "Images"
 msgstr "Bilder"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
 msgid "Read GPS..."
 msgstr "Lese GPS..."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Kein Zeit für Punkt {0} x {1}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
 msgid "Time loop in gps data."
 msgstr "Zeit-Schleife in GPS-Daten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lese {0} ...."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
 msgid "Geotagged Images"
 msgstr "Bilder mit Ortsbezug"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS Start: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Ende: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Momentaner Unterschied {0}s"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
 msgid "image"
 msgid_plural "images"
@@ -1178,44 +1187,44 @@
 msgstr[1] "Bilder"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innerhalb des Tracks."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "Sync clock"
 msgstr "Uhrzeit Synchronisieren"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Die Datei {0} kann nicht verarbeitet werden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
 msgid "Image"
 msgstr "Bild"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
 msgid "Syncronize Time with GPS Unit"
 msgstr "Zeit mit GPS Gerät synchronisieren"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:46
 msgid "Wrong longitude transformation for tile cache. Can't operate on {0}"
 msgstr ""
@@ -1223,128 +1232,96 @@
 "operieren."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
 #, java-format
 msgid "WMS layer: {0}"
 msgstr "WMS-Ebene: {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unbekannter Typ in Zeile {0}"
-
-#: /home/sven/svn/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})"
-
-#: /home/sven/svn/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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "Element"
-msgstr[1] "Elemente"
-
-#: /home/sven/svn/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}"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
 msgid "Could not read bookmarks."
 msgstr "Kann Lesezeichen nicht lesen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
 msgid "Could not write bookmark."
 msgstr "Kann Lesezeichen nicht schreiben."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MapView.java:124
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Java Open Street Map - Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MapView.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:55
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Übertragen zum Server entstanden."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "There are unsaved changes. Really quit?"
 msgstr "Es gibt ungesicherte Daten. Wirklich beenden?"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:56
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
 msgid "Unsaved Changes"
 msgstr "Daten nicht gespeichert"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "usage"
 msgstr "Benutzung"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "options"
 msgstr "Optionen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Show this help"
 msgstr "Zeige diese Hilfe"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Download the bounding box"
 msgstr "Lade den Zeichen-Kasten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
 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)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Download the bounding box as raw gps"
 msgstr "Lade den Zeichen-Kasten als Roh-GPS"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Select with the given search"
 msgstr "Auswählen mit der angegebenen Suche"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Don't launch in fullscreen mode"
 msgstr "Nicht im Vollbildmodus starten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Defaultwerte zurückstellen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Set the language. Example: "
 msgstr "Die Sprache Einstellen. Beispiel:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "examples"
 msgstr "Beispiele"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -1355,13 +1332,13 @@
 "selection verwendet wird."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MapStatus.java:221
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:221
 msgid "Lat/Lon"
 msgstr "Breite/Länge"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1370,53 +1347,53 @@
 msgstr[1] "{0} Objekte haben Konflikte:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr "meine Version:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr "deren Version:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr "neue Version:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
 msgid "Contacting the OSM server..."
 msgstr "Versuche OSM Server zu erreichen...."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
 msgid "Error while parsing"
 msgstr "Fehler beim Parsen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
 msgid "File Not found"
 msgstr "Datei wurde nicht gefunden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "string"
 msgstr "Zeichenkette"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr "Name des Benutzers."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr "OSM Passwort."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: /home/imi/src/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)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "string;string;..."
 msgstr "Zeichenkette;Zeichenkette;..."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: /home/imi/src/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 "
@@ -1426,5 +1403,5 @@
 "Dateiname sein."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
@@ -1434,5 +1411,5 @@
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: /home/imi/src/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 "
@@ -1442,109 +1419,113 @@
 "Suchanfrage oder eine URL  auf ein osm-xml Dokument sein."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr "jeder"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: /home/imi/src/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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:71
+msgstr ""
+"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
 msgid "Username"
 msgstr "Benutzername"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:74
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
 msgid "Password"
 msgstr "Passwort"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
 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."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
+msgstr ""
+"Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
 msgid "Draw lines between raw gps points."
 msgstr "Zeichne Linien zwischen Roh GPS Punkten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
 msgid "Force lines if no segments imported."
 msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
 msgid "Draw large GPS points."
 msgstr "Zeichne große GPS Punkte."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
 msgid "Draw Direction Arrows"
 msgstr "Zeichne Richtungspfeile"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
-msgid "Force drawing of lines if the imported data contain no line information."
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
 "Informationen enthalten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
 msgid "Draw larger dots for the GPS points."
 msgstr "Zeichnet größere Punkte für GPS-Punkte."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
 msgid "Draw direction hints for all segments."
 msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "Color"
 msgstr "Farbe"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Name"
 msgstr "Name"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
 msgid "Choose"
 msgstr "Wähle"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 msgid "Please select a color."
 msgstr "Bitte eine Farbe wählen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Eine Farbe für {0} auswählen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
 msgid "Annotation preset source"
 msgstr "Voreinstellungsquelle"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "The base URL to the OSM server (REST API)"
 msgstr "Die Basis URL des OSM Servers (REST API)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
 msgid "Login name (email) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM Server."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
-msgid "Login password to the OSM account. Leave blank to not store any password."
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM Server. Leer lassen, wenn kein Passwort gespeichert "
 "werden soll."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "Die Basis URL für WMS Hintergrund-Bilder."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1563,5 +1544,5 @@
 "ließt einfach die Länge und Breite durch Komma getrennt.</html>"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1571,9 +1552,9 @@
 "werden um die Linien entlang des Weges zu vervollständigen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1583,55 +1564,56 @@
 "josm.eigenheimstrasse.de/wiki/AnnotationPresets für Hilfe."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
 msgid "Add a new annotation preset source to the list."
 msgstr "Eine neue Voreinstellungsdatei zu der Liste hinzufügen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle löschen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid ""
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr "Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
+msgstr ""
+"Diverse Optionen die die Visuell Repräsentation des Programms beeinflussen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid "Colors"
 msgstr "Farben"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings to the OSM server."
 msgstr "Verbinungseinstellungen des OSM Servers."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Base Server URL"
 msgstr "Basis Rechner URL"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "OSM username (email)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
 msgid "OSM password"
 msgstr "OSM Passwort"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1643,100 +1625,134 @@
 "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV Import Definition (leer: lese aus der ersten Zeile der Daten)"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Projection method"
 msgstr "Projektionsmethode"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Annotation preset sources"
 msgstr "Voreinstellungs-Quellen:"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unbekannter Typ in Zeile {0}"
+
+#: /home/imi/src/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})"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "Element"
+msgstr[1] "Elemente"
+
+#: /home/imi/src/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}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Einstellungen ändern"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
 msgid "Conflicts in disjunct objects"
 msgstr "Konflikte in unabhängigen Objekten"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
 #, java-format
 msgid "Downloading {0} {1}"
 msgstr "Hole {0} {1}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
 msgid "Got more than one object when expecting only one."
 msgstr "Habe ein Objekt erwartet, aber mehrere empfangen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:98
+msgid "Unknown version"
+msgstr "Version unbekannt."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr "<seg>-Tag auf einen Nicht-Weg gefunden."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr "Unvollständiger Abschnitt mit id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr "NullPointerException. Vielleicht fehlende Tags."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr "Illegales Objekt mit id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr "Kann das Zeit-Format \"{0}\" nicht lesen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr "Breite Daten vor ...."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr "Kranken Knotenpunkt Id"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
 #, java-format
 msgid "Upload {0} {1} ({2})..."
 msgstr "Überspiele {0} {1} ({2})..."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
 msgid "Unknown host"
 msgstr "Rechner unbekannt."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:96
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:98
-msgid "Unknown version"
-msgstr "Version unbekannt."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:114
-msgid "Found <seg> tag on non-way."
-msgstr "<seg>-Tag auf einen Nicht-Weg gefunden."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:117
-msgid "Incomplete segment with id=0"
-msgstr "Unvollständiger Abschnitt mit id=0"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:126
-msgid "NullPointerException. Possible some missing tags."
-msgstr "NullPointerException. Vielleicht fehlende Tags."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:141
-msgid "Illegal object with id=0"
-msgstr "Illegales Objekt mit id=0"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:149
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr "Kann das Zeit-Format \"{0}\" nicht lesen."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:164
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:213
-msgid "Preparing data..."
-msgstr "Breite Daten vor ...."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmReader.java:222
-msgid "Illformed Node id"
-msgstr "Kranken Knotenpunkt Id"
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawGpsReader.java:43
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawGpsReader.java:45
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
 msgid "Could not detect data format string."
 msgstr "Kann das Format nicht ermitteln."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
 msgid ""
 "Format string in data is incomplete or not found. Try setting an manual "
@@ -1746,102 +1762,103 @@
 "Versuchen sie das Format in den Einstellungen einzustellen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:63
-msgid "Format string is incomplete. Need at least 'lat' and 'lon' specification"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
 msgstr ""
 "Die Format -Zeile ist unvollständig. Brauche mindestens 'lat' und 'lon' "
 "Spalten."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
 #, java-format
 msgid "Unknown data type: \"{0}\"."
 msgstr "Unbekannter Datentyp \"{0}\"."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: /home/imi/src/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."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
 #, java-format
 msgid "Parsing error in line {0}"
 msgstr "Fehler beim parsen der Zeile {0}"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:70
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Lade Punkte {0} bis {1}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
+msgid "Downloading OSM data..."
+msgstr "Hole OSM-Daten...."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:84
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmConnection.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
 msgid "Aborting..."
 msgstr "Abbruch..."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr "Lade Punkte {0} bis {1}..."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
-msgid "Downloading OSM data..."
-msgstr "Hole OSM-Daten...."
-
-#: /home/sven/svn/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
 msgid "Error during parse."
 msgstr "Fehler beim parsen."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
 msgid "position"
 msgstr "Position"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
 msgid "different"
 msgstr "verschieden"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr "gelöscht"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr "wahr"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr "falsch"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr "nichts"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr "Abschnitte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr "bis"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr "von"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "new"
 msgstr "neu"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "unknown"
 msgstr "unbekannt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
 #, java-format
 msgid "{0} node"
@@ -1850,52 +1867,52 @@
 msgstr[1] "{0} Knotenpunkte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:131
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
 msgid "background"
 msgstr "Hintergrund"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
 msgid "incomplete way"
 msgstr "unvollständiger Weg"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:136
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
 msgid "selected"
 msgstr "gewählt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
 msgid "gps point"
 msgstr "GPS Punkt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/data/Preferences.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "scale"
 msgstr "Skala"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#: /home/imi/src/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"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr "Ändere"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr "Abfolge"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Remove \"{0}\" for"
 msgstr "Entferne \"{0}\" für"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Set {0}={1} for"
 msgstr "Setze {0}={1} für"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -1903,29 +1920,33 @@
 msgstr[1] "Objekte"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
 msgid "Annotation Preset Tester"
 msgstr "Voreinstellungsquellen Tester"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:171
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
 msgid "Files"
 msgstr "Dateien"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:181
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
 msgid "Connection"
 msgstr "Verbindung"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:188
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
 msgid "Layer"
 msgstr "Ebene"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:204
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
 msgid "Help"
 msgstr "Hilfe"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:249
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:299
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1933,12 +1954,11 @@
 "RPSG:4263."
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: /home/sven/svn/src/org/openstreetmap/josm/Main.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
 msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
-
Index: /po/en_GB.po
===================================================================
--- /po/en_GB.po	(revision 132)
+++ /po/en_GB.po	(revision 133)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-25 00:28+0200\n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
 "PO-Revision-Date: 2006-07-22 16:18+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -29,6 +29,7 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -199,6 +200,22 @@
 msgstr "Add Node into Segment"
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#, fuzzy
+msgid "Reverse Segments"
+msgstr "segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#, fuzzy
+msgid "Revert the direction of all selected Segments."
+msgstr "Wrong direction of segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#, fuzzy
+msgid "Please select at least one segment."
+msgstr "Please select the row to delete."
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Preferences"
 msgstr "Preferences"
@@ -312,6 +329,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -535,4 +552,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
@@ -707,41 +726,41 @@
 msgstr "Shift-"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Load Selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact {0}..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
+#: /home/imi/src/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}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Parsing error in url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Select"
 msgstr "Select"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -750,26 +769,27 @@
 "Set the selected elements on the map to the selected items in the list above."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Reload"
 msgstr "Reload"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Refresh the selection list."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
 msgid "Search"
 msgstr "Search"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Search for objects."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -785,13 +805,13 @@
 "li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr "replace selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr "add to selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr "remove from selection"
@@ -861,6 +881,6 @@
 msgstr "Merge the selected layer into the layer directly below."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 #, fuzzy, java-format
 msgid "This will change {0} object."
@@ -869,5 +889,5 @@
 msgstr[1] "This will change {0} object."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
 #, java-format
 msgid ""
@@ -876,42 +896,42 @@
 "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:108
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
 msgid "Change values?"
 msgstr "Change values?"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:126
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 msgid "<different>"
 msgstr "<different>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Properties"
 msgstr "Properties"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Property for selected objects."
 msgstr "Properties for selected objects."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
 #, fuzzy, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Could not read from url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
 #, fuzzy, java-format
 msgid "Error parsing {0}: "
 msgstr "Error while parsing {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -920,75 +940,77 @@
 msgstr[1] "This will change {0} object."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Key"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Value"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select the row to edit."
 msgstr "Please select the row to edit."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:302
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "Please select the row to delete."
 msgstr "Please select the row to delete."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:228
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
 msgid "Edit"
 msgstr "Edit"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
-#, fuzzy, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unknown file extension: {0}"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
-#, java-format
-msgid ""
-"display_values ({0}) and values ({1}) must be of same number of elements."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
 #, fuzzy
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segment"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:190
-#, java-format
-msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:260
-#, fuzzy
-msgid "Change Properties"
-msgstr "Properties"
+msgid "Revert"
+msgstr "Remove"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Object"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
@@ -1097,5 +1119,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG images (*.jpg)"
@@ -1167,35 +1189,35 @@
 msgstr "{0} within the track."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "Sync clock"
 msgstr "Sync clock"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "The date in file \"{0}\" could not be parsed."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "There is no EXIF time within the file \"{0}\"."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
 msgid "Image"
 msgstr "Image"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
 msgid "GPS unit timezome (difference to photo)"
 msgstr "GPS unit timezome (difference to photo)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
 msgid "Syncronize Time with GPS Unit"
 msgstr "Synchronise Time with GPS Unit"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
 msgid "Time entered could not be parsed."
 msgstr "Time entered could not be parsed."
@@ -1310,8 +1332,4 @@
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Object"
-msgstr "Object"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
@@ -1412,33 +1430,33 @@
 msgstr "Password"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
 msgid "Draw lines between raw gps points."
 msgstr "Draw lines between raw gps points."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
 msgid "Draw large GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1446,47 +1464,47 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
 msgid "Draw direction hints for all segments."
 msgstr "Draw direction hints for all segments."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "Color"
 msgstr "Colour"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Name"
 msgstr "Name"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
 msgid "Choose"
 msgstr "Choose"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 msgid "Please select a color."
 msgstr "Please select a colour."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choose a colour for {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
 msgid "Annotation preset source"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "The base URL to the OSM server (REST API)"
 msgstr "The base URL to the OSM server (REST API)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
 msgid "Login name (email) to the OSM account."
 msgstr "Login name (email) to the OSM account."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1494,9 +1512,9 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "The base URL to the server retrieving WMS background pictures from."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1514,5 +1532,5 @@
 "example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1522,9 +1540,9 @@
 "way."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1532,18 +1550,18 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
 msgid "Add a new annotation preset source to the list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 #, fuzzy
 msgid "Delete the selected source from the list."
 msgstr "Delete the selected layer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1553,37 +1571,37 @@
 "program."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
 msgid "Language"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid "Colors"
 msgstr "Colours"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings to the OSM server."
 msgstr "Connection Settings to the OSM server."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "OSM username (email)"
 msgstr "OSM username (email)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
 msgid "OSM password"
 msgstr "OSM password"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1595,23 +1613,57 @@
 "url.<br><b>Do not use a valuable Password.</b></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV import specification (empty: read from first line in data)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Map Settings"
 msgstr "Map Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Settings for the map projection and data interpretation."
 msgstr "Settings for the map projection and data interpretation."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Projection method"
 msgstr "Projection method"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Annotation preset sources"
 msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, fuzzy, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unknown file extension: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr ""
+
+#: /home/imi/src/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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+#, fuzzy
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "segment"
+msgstr[1] "segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+#, fuzzy
+msgid "Change Properties"
+msgstr "Properties"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1856,49 +1908,42 @@
 msgstr[1] "object"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
 msgid "Annotation Preset Tester"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
-#, fuzzy
-msgid "Please select at least one segment."
-msgstr "Please select the row to delete."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:192
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:196
-#, fuzzy
-msgid "Reverse Segments"
-msgstr "segments"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:206
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
 msgid "Files"
 msgstr "Files"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:216
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
 msgid "Connection"
 msgstr "Connection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:223
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
 msgid "Layer"
 msgstr "Layer"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:239
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
 msgid "Help"
 msgstr "Help"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:284
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
 msgid "unnamed"
 msgstr "unnamed"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:334
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr "The projection could not be read from preferences. Using EPSG:4263."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:390
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignoring malformed url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
Index: /po/fr.po
===================================================================
--- /po/fr.po	(revision 132)
+++ /po/fr.po	(revision 133)
@@ -7,5 +7,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-25 00:28+0200\n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
 "PO-Revision-Date: 2006-07-21 21:36+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -25,6 +25,7 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -202,6 +203,22 @@
 msgstr "Ajouter un noeud dans un segment"
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#, fuzzy
+msgid "Reverse Segments"
+msgstr "segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#, fuzzy
+msgid "Revert the direction of all selected Segments."
+msgstr "Segments dans la mauvaise direction."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#, fuzzy
+msgid "Please select at least one segment."
+msgstr "Sélectionner l'étage à supprimer."
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Preferences"
 msgstr "Préférences"
@@ -317,6 +334,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -542,4 +559,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
 msgid "Not implemented yet."
 msgstr "Pas encore implémenté."
@@ -714,41 +733,41 @@
 msgstr "Shift-"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Charger la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact de {0}..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
+#: /home/imi/src/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}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
+#: /home/imi/src/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}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/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."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Select"
 msgstr "Sélectionner"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -758,26 +777,27 @@
 "liste."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Reload"
 msgstr "Recharger"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Actualiser la liste de sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
 msgid "Search"
 msgstr "Chercher"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Rechercher des objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Please enter a search string."
 msgstr "Entrer le texte à rechercher."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -794,13 +814,13 @@
 "·key=foot·associé à n'importe quelle valeur.</ul></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
@@ -872,6 +892,6 @@
 "Fusionner les calques sélectionnés dans le calque directement en dessous."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 #, java-format
 msgid "This will change {0} object."
@@ -880,5 +900,5 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
 #, java-format
 msgid ""
@@ -888,42 +908,42 @@
 "vide supprime la clé)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:108
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:126
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 msgid "<different>"
 msgstr "<différent>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 msgid "Please select a key"
 msgstr "Sélectionner une clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
 msgid "Please select a value"
 msgstr "Sélectionner une valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Properties"
 msgstr "Propriétés"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Property for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
 #, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Impossible de lire le fichier d'annotations : {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -932,74 +952,77 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select the row to edit."
 msgstr "Sélectionnez l'étage à éditer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:302
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "Please select the row to delete."
 msgstr "Sélectionner l'étage à supprimer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:228
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
 msgid "Edit"
 msgstr "Éditer"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
-#, fuzzy, java-format
-msgid "Unknown type at line {0}"
-msgstr "Extension de fichier inconnue : {0}"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
-#, java-format
-msgid ""
-"display_values ({0}) and values ({1}) must be of same number of elements."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
 #, fuzzy
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segments"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/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}"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:260
-msgid "Change Properties"
-msgstr "Changer les propriétés"
+msgid "Revert"
+msgstr "Supprimer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Objet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
@@ -1103,5 +1126,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
 msgid "JPEG images (*.jpg)"
 msgstr "images JPEG (*.jpg)"
@@ -1172,35 +1195,35 @@
 msgstr "{0} dans la trace."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "Sync clock"
 msgstr "Synchroniser l'horloge"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La date du fichier \"{0}\" ne peut être analysée."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
 #, 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}\"."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
 msgid "Image"
 msgstr "Image"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 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)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zone horaire de l'unité GPS (différence avec la photo)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
 msgid "Syncronize Time with GPS Unit"
 msgstr "Synchroniser l'heure avec l'unité GPS"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
 msgid "Time entered could not be parsed."
 msgstr "L'heure indiquée ne peut être analysée."
@@ -1320,8 +1343,4 @@
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Object"
-msgstr "Objet"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
@@ -1424,33 +1443,33 @@
 msgstr "Mot de passe"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
 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."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
 msgid "Draw lines between raw gps points."
 msgstr "Dessiner des lignes entre les points GPS bruts."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment importé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1459,47 +1478,47 @@
 "d'informationsur les lignes."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
 msgid "Draw larger dots for the GPS points."
 msgstr "Dessine de plus gros points GPS."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
 msgid "Draw direction hints for all segments."
 msgstr "Dessine les flèches de direction pour tous les segments."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "Color"
 msgstr "Couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Name"
 msgstr "Nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
 msgid "Choose"
 msgstr "Choisir"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 msgid "Please select a color."
 msgstr "Sélectionner une couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choisir une couleur pour {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
 msgid "Annotation preset source"
 msgstr "Source du fichier d'annotations"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "The base URL to the OSM server (REST API)"
 msgstr "L'URL de base du serveur OSM (API)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
 msgid "Login name (email) to the OSM account."
 msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1508,9 +1527,9 @@
 "aucun mot de passe."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
 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."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1529,5 +1548,5 @@
 "par une virgule.</html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1537,9 +1556,9 @@
 "dessiner des lignes le long de votre chemin."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
 msgid "Colors used by different objects in JOSM."
 msgstr "Couleurs utilisées par les différents objets de JOSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1549,17 +1568,17 @@
 "josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
 msgid "Add a new annotation preset source to the list."
 msgstr "Ajouter un nouveau fichier d'annotations à la liste."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid "Delete the selected source from the list."
 msgstr "Supprimer la source sélectionné de la liste."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Display Settings"
 msgstr "Réglages d'affichage"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1567,37 +1586,37 @@
 msgstr "Divers réglages de l'apparence de tout le programme."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Look and Feel"
 msgstr "Apparence et comportement"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
 msgid "Language"
 msgstr "Langue"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid "Colors"
 msgstr "Couleurs"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings to the OSM server."
 msgstr "Réglages de connexion au serveur OSM"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "OSM username (email)"
 msgstr "Nom d'utilisateur OSM (e-mail)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1609,5 +1628,5 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
@@ -1615,20 +1634,53 @@
 "données)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 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."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Projection method"
 msgstr "Méthode de projection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Annotation preset sources"
 msgstr "Sources des annotations prédéfinies"
+
+#: /home/imi/src/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}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr ""
+
+#: /home/imi/src/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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+#, fuzzy
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "segment"
+msgstr[1] "segments"
+
+#: /home/imi/src/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}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Changer les propriétés"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1873,41 +1925,34 @@
 msgstr[1] "objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
 #, fuzzy
 msgid "Annotation Preset Tester"
 msgstr "Source du fichier d'annotations"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
-#, fuzzy
-msgid "Please select at least one segment."
-msgstr "Sélectionner l'étage à supprimer."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:192
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:196
-#, fuzzy
-msgid "Reverse Segments"
-msgstr "segments"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:206
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
 msgid "Files"
 msgstr "Fichiers"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:216
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:223
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
 msgid "Layer"
 msgstr "Calque"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:239
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
 msgid "Help"
 msgstr "Aide"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:284
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:334
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1915,10 +1960,10 @@
 "utilisé."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:390
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
Index: /po/keys.pot
===================================================================
--- /po/keys.pot	(revision 132)
+++ /po/keys.pot	(revision 133)
@@ -9,5 +9,5 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-17 02:43+0200\n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -27,6 +27,7 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -187,6 +188,19 @@
 msgstr ""
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+msgid "Reverse Segments"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+msgid "Revert the direction of all selected Segments."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+msgid "Please select at least one segment."
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Preferences"
 msgstr ""
@@ -298,6 +312,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:236
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -336,48 +350,57 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, java-format
+msgid "Java Version {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Readme"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
 msgid "Revision"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "Contribution"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "About JOSM..."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
 msgid "File could not be found."
 msgstr ""
@@ -404,5 +427,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "conflict"
 msgstr ""
@@ -511,4 +534,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
 msgid "Not implemented yet."
 msgstr ""
@@ -671,41 +696,41 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Open a selection list window."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Select"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:136
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -713,26 +738,27 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Reload"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr ""
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
+msgid "Search"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
+msgid "Search for objects."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+msgid "Please enter a search string."
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:187
-msgid "Search"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
-msgid "Search for objects."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
-msgid "Please enter a search string."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:160
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -743,13 +769,13 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr ""
@@ -779,46 +805,46 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Open a list of all commands (undo buffer)."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
 msgid "Delete the selected layer."
 msgstr ""
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+msgid "Show/Hide"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Show/Hide"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:81
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Layers"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Open a list of all loaded layers."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
 msgid "Move the selected layer one row up."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
 msgid "Move the selected layer one row down."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 #, java-format
 msgid "This will change {0} object."
@@ -827,5 +853,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
 #, java-format
 msgid ""
@@ -833,70 +859,124 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
+msgid "Change values?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+msgid "<different>"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+msgid "Please select a key"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
-msgid "Change values?"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:119
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
-msgid "<different>"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
-msgid "Please select a key"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "Please select a value"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Properties"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Property for selected objects."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
+#, java-format
+msgid "Could not read annotation preset source: {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
+#, java-format
+msgid "Error parsing {0}: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:238
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+msgid "Please select the row to edit."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
+msgid "Please select the row to delete."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+msgid "Add a new key/value pair to all objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
 msgid "Edit"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
-msgid "Please select the row to edit."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
-msgid "Please select the row to delete."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
-msgid "Add a new key/value pair to all objects"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
 msgid "Delete the selected key in all objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Revert"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
 msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "node"
@@ -907,5 +987,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
 msgid "segment"
 msgid_plural "segments"
@@ -915,5 +995,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "way"
 msgid_plural "ways"
@@ -939,5 +1019,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
 msgid "track"
 msgid_plural "tracks"
@@ -945,5 +1025,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
 msgid "point"
 msgid_plural "points"
@@ -951,5 +1031,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
 #, java-format
 msgid "a track with {0} point"
@@ -958,10 +1038,10 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} consists of {1} track"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} point"
@@ -970,31 +1050,31 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
 msgid "Customize Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "OK"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
 msgid "Cancel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "Default"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
 msgid "Choose a color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 msgid "Import images"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
 msgid "JPEG images (*.jpg)"
 msgstr ""
@@ -1065,35 +1145,35 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "Sync clock"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
 msgid "Image"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
 msgid "GPS unit timezome (difference to photo)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
 msgid "Syncronize Time with GPS Unit"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
 msgid "Time entered could not be parsed."
 msgstr ""
@@ -1116,72 +1196,93 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:159
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Java Open Street Map - Editor"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:199
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
 msgid "layer not in list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "There are unsaved changes. Really quit?"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
 msgid "Unsaved Changes"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:74
-msgid ""
-"Java OpenStreetMap Editor\n"
-"\n"
-"usage:\n"
-"\tjava -jar josm.jar <option> <option> <option>...\n"
-"\n"
-"options:\n"
-"\t--help|-?|-h                              Show this help\n"
-"\t--geometry=widthxheight(+|-)x(+|-)y       Standard unix geometry argument\n"
-"\t[--download=]minlat,minlon,maxlat,maxlon  Download the bounding box\n"
-"\t[--download=]<url>                        Download the location at the url "
-"(with lat=x&lon=y&zoom=z)\n"
-"\t[--download=]<filename>                   Open file (as raw gps, if .gpx "
-"or .csv)\n"
-"\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw "
-"gps\n"
-"\t--selection=<searchstring>                Select with the given search\n"
-"\t--no-fullscreen                           Don't launch in fullscreen mode\n"
-"\t--reset-preferences                       Reset the preferences to "
-"default\n"
-"\n"
-"examples:\n"
-"\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"
-"\tjava -jar josm.jar http://www.openstreetmap.org/index.html?"
-"lat=43.2&lon=11.1&zoom=13\n"
-"\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/"
-"OSM_errors_node-duplicate.xml\n"
-"\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"
-"\n"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Java OpenStreetMap Editor"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "usage"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
+msgid "options"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Show this help"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Download the bounding box"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgid "Select with the given search"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
+msgid "Don't launch in fullscreen mode"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
+msgid "Reset the preferences to default"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
+msgid "Set the language. Example: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "examples"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
+msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection\n"
-"\n"
-"Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#, java-format
-msgid "Cannot open preferences directory: {0}"
+"some data before --selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:221
 msgid "Lat/Lon"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Object"
 msgstr ""
 
@@ -1277,76 +1378,89 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
 msgid "OptionPane.okButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:100
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
 msgid "OptionPane.cancelButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
+msgid "Draw large GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:219
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:222
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
+msgid "Draw larger dots for the GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
 msgid "Draw direction hints for all segments."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:238
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Name"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
 msgid "Choose"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 msgid "Please select a color."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:268
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
+msgid "Annotation preset source"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:276
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1358,5 +1472,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:286
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1364,13 +1478,27 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
+msgid ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
+msgid "Add a new annotation preset source to the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Display Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1378,33 +1506,37 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:293
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Look and Feel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:299
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
+msgid "Language"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid "Colors"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings to the OSM server."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Base Server URL"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "OSM username (email)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
 msgid "OSM password"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1413,18 +1545,54 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:322
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Map Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Projection method"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+msgid "Annotation preset sources"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr ""
+
+#: /home/imi/src/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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
 msgstr ""
 
@@ -1617,18 +1785,22 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
 msgid "background"
 msgstr ""
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+msgid "incomplete way"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
-msgid "incomplete way"
+msgid "selected"
 msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
-msgid "selected"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "gps point"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "scale"
 msgstr ""
 
@@ -1662,40 +1834,42 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
+msgid "Annotation Preset Tester"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
 msgid "Files"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
 msgid "Connection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
 msgid "Layer"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
 msgid "Help"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
 msgid "unnamed"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:274
-#, java-format
-msgid ""
-"Preferences could not be loaded. Write default preference file to \"{0}\"."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:285
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
Index: /po/ro.po
===================================================================
--- /po/ro.po	(revision 133)
+++ /po/ro.po	(revision 133)
@@ -0,0 +1,1956 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
+"PO-Revision-Date: 2006-08-02 14:31+0200\n"
+"Last-Translator: Ovidiu Constantin <ovidiu@mybox.ro>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
+msgid "Add segment"
+msgstr "Adaugă segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+msgid "Add a segment between two nodes."
+msgstr "Adaugă un segment între două noduri."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+msgid "Delete"
+msgstr "Şterge"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
+msgid "Delete nodes, streets or segments."
+msgstr "Şterge noduri, străzi sau segmente."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+msgid "Cannot delete node."
+msgstr "Nu pot şterge nodul."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
+msgid "This object is in use."
+msgstr "Acest obiect este în uz."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
+msgid "Used by more than two segments."
+msgstr "Folosit de mai mult de două segmente."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
+msgid "Used by only one segment."
+msgstr "Folosit de un singur segment."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
+msgid "Used in a way."
+msgstr "Folosit într-o cale."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Direcţie greşită a segmentelor."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Chei în conflict"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
+msgid "Delete Node"
+msgstr "Şterge nod"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Apropie"
+
+#: /home/imi/src/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,+,-)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Selection"
+msgstr "Selecţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Select objects by dragging or clicking."
+msgstr "Selectează obiecte prin tragere sau clic."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Straight line"
+msgstr "Linie dreaptă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Select objects in a straight line."
+msgstr "Selectează obiectele din o linie dreaptă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
+msgid "Move"
+msgstr "Mută"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+msgid "Move selected objects around."
+msgstr "Mută obiectele selectate."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
+msgid "Cannot move objects outside of the world."
+msgstr "Nu pot muta obiecte în afara lumii."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add Way"
+msgstr "Adaugă cale"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add a new way to the data."
+msgstr "Adaugă o nouă cale datelor."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+msgid ""
+"Warning: This way is incomplete. Try to download it, before adding segments."
+msgstr ""
+"Atentie: Această cale este incompletă. Încercaţi să o descărcaţi înainte de "
+"a adăuga segmente."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#, java-format
+msgid ""
+"{0} way has been selected.\n"
+"Do you wish to select all segments belonging to the way instead?"
+msgid_plural ""
+"{0} ways have been selected.\n"
+"Do you wish to select all segments belonging to the ways instead?"
+msgstr[0] ""
+"{0} cale a fost selectată.\n"
+"Doriţi în schimb să selectaţi toate segmentele aparţinând căii?"
+msgstr[1] ""
+"{0} căi au fost selectate.\n"
+"Doriţi în schimb să selectaţi toate segmentele aparţinând căilor?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+msgid "Add segments from ways"
+msgstr "Adaugă segmente din căi"
+
+#: /home/imi/src/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?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+msgid "Add segments to way?"
+msgstr "Adaug segmente căii?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder all line segments?"
+msgstr "Reordonez toate segmentele de dreaptă?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder?"
+msgstr "Reordonez?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#, java-format
+msgid "Create a new way out of {0} segment?"
+msgid_plural "Create a new way out of {0} segments?"
+msgstr[0] "Crează o cale nouă din {0} segment?"
+msgstr[1] "Crează o cale nouă din {0} segmente?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+msgid "Create new way"
+msgstr "Crează o nouă cale"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add node"
+msgstr "Adaugă nod"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add a new node to the map"
+msgstr "Adaugă un nod pe hartă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add node into segment"
+msgstr "Adaugă un nod la segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add a node into an existing segment"
+msgstr "Adaugă un nod la un segment existent"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+msgid "Can not add a node outside of the world."
+msgstr "Nu pot adăuga un nod în afara lumii."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+msgid "Add Node into Segment"
+msgstr "Adaugă nod în segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+msgid "Reverse Segments"
+msgstr "Inversează segmentele"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+msgid "Revert the direction of all selected Segments."
+msgstr "Inversează direcţia tuturor segmentelor selectate."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
+msgid "Preferences"
+msgstr "Preferinţe"
+
+#: /home/imi/src/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"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open"
+msgstr "Deschide"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open a file."
+msgstr "Deschide un fişier."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Extensie fişier necunoscută : {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:63
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid "Data Layer"
+msgstr "Strat de date"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Eroare la prelucrarea {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nu am putut citi \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo"
+msgstr "Anulează"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Anulează ultima acţiune."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+msgid "Downloading data"
+msgstr "Descarc date"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:80
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:59
+msgid "No data imported."
+msgstr "Nu au fost importate date."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
+msgid "Downloading GPS data"
+msgstr "Descarc date GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
+msgid "Open as raw gps data"
+msgstr "Deschide ca date gps neprelucrate"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download from OSM"
+msgstr "Descarcă de la OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download map data from the OSM server."
+msgstr "Descarcă hărţi de la serverul OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:140
+msgid ""
+"Move and zoom the image like the main map. Select an area to download by "
+"dragging."
+msgstr ""
+"Mută şi măreşte imaginea ca şi harta principală. Selectaţi prin tragere zona "
+"ce va fi descărcată."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
+msgid "Bounding box"
+msgstr "Perimetru selectat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
+msgid "min lat"
+msgstr "min lat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
+msgid "min lon"
+msgstr "min lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
+msgid "max lat"
+msgstr "max lat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
+msgid "max lon"
+msgstr "max lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
+msgid "URL from www.openstreetmap.org"
+msgstr "Adresa de la www.openstreetmap.org"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
+msgid "Bookmarks"
+msgstr "Semne de carte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
+msgid "Add"
+msgstr "Adaugă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
+msgid "Please enter the desired coordinates first."
+msgstr "Vă rog întâi introduceţi coordonatele dorite."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
+msgid "Please enter a name for the location."
+msgstr "Vă rog introduceţi un nume pentru locaţie."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
+msgid "Remove"
+msgstr "Elimină"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
+msgid "Select a bookmark first."
+msgstr "Selectaţi întâi un semn de carte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
+msgid "Choose an area"
+msgstr "Alegeţi o zonă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit"
+msgstr "Ieşire"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit the application."
+msgstr "Părăsiţi aplicaţia."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "About"
+msgstr "Despre"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "Display the about screen."
+msgstr "Afişează ecranul cu informaţii despre program."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Versiunea {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#, java-format
+msgid "last change at {0}"
+msgstr "ultima modificare la {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java Versiunea {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+msgid "Homepage"
+msgstr "Pagina pricipală"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
+msgid "Bug Reports"
+msgstr "Rapoarte erori"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Informaţii"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Readme"
+msgstr "Citeşte-mă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
+msgid "Revision"
+msgstr "Revizia"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "Contribution"
+msgstr "Contribuţii"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+msgid "About JOSM..."
+msgstr "Despre JOSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
+msgid "File could not be found."
+msgstr "Fişierul nu a putut fi găsit."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "File exists. Overwrite?"
+msgstr "Fişierul există. Îl suprascriu?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "Overwrite"
+msgstr "Suprascrie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr "date"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+msgid "selection"
+msgstr "selecţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+msgid "layer"
+msgstr "strat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+msgid "conflict"
+msgstr "conflict"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr "Scalare automată: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
+#, java-format
+msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+msgstr ""
+"Mărire automată pentru a vizualiza (la {0}. Dezactivat dacă vizualizarea "
+"este mutată)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload to OSM"
+msgstr "Transmite la OSM"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Uploading data"
+msgstr "Transmit datele"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgid "No changes to upload."
+msgstr "Nu sunt schimbări de transmis."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
+msgid "Objects to add:"
+msgstr "Obiecte de adăugat:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
+msgid "Objects to modify:"
+msgstr "Obiecte de modificat:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
+msgid "Objects to delete:"
+msgstr "Obiecte de şters:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
+msgid "Upload this changes?"
+msgstr "Transmit aceste schimbări?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fişiere server OSM (.osm .xml)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "Fişiere GPX (.gpx)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fişiere CSV (.csv .txt)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refă ultima acţiune anulată."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
+#, java-format
+msgid "Downloading {0} segments"
+msgid_plural "Downloading {0} segment"
+msgstr[0] "Descarc {0} segmente"
+msgstr[1] "Descarc {0} segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download incomplete objects"
+msgstr "Descarcă obiecte incomplete"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr "Descarcă toate căile incomplete (selectate) de pe serverul OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+#, java-format
+msgid "Download {0} ways containing a total of {1} segments?"
+msgstr "Descarc {0} căi conţinând în total {1} segmente?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+msgid "Download?"
+msgstr "Descarc?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Show background"
+msgstr "Arată fundalul"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Download and show landsat background images."
+msgstr "Descarcă şi afişează imagini landsat pe fundal."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
+msgid "Not implemented yet."
+msgstr "Nu a fost încă implementat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save"
+msgstr "Salvează"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save the current data."
+msgstr "Salvează datele curente."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
+msgid "No document open so nothing to save."
+msgstr "Nu este nici un document deschis, nu este nimic de salvat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "The document contains no data. Save anyway?"
+msgstr "Acest document nu conţine date. Salvez oricum?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "Empty document"
+msgstr "Document gol"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Există conflicte nerezolvate. Conflictele nu vor fi salvate şi se vor trata "
+"ca şi cum aţi refuzat totul. Continui?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
+msgid "Conflicts"
+msgstr "Conflicte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
+msgid "CSV output not supported yet."
+msgstr "Formatul CSV nu este încă suportat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
+msgid "Unknown file extension."
+msgstr "Extensie fişier necunoscută."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
+msgid "An error occoured while saving."
+msgstr "A intervenit o eroare în timpul salvării."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:39
+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"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export to GPX"
+msgstr "Exportă GPX"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export the data to GPX file."
+msgstr "Exportă datele într-un fişier GPX."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+msgid "gps track description"
+msgstr "descrierea pistei gps"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
+msgid "Add author information"
+msgstr "Adaugă informaţii despre autor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
+msgid "Real name"
+msgstr "Nume real"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+msgid "Email"
+msgstr "Email"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+msgid "Copyright (URL)"
+msgstr "Drepturi de autor (adresă)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+msgid "Predefined"
+msgstr "Predefinit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
+msgid "Copyright year"
+msgstr "An drepturi de autor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
+msgid "Keywords"
+msgstr "Cuvinte cheie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+msgid "Export options"
+msgstr "Opţiuni exportare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Eroare la exportarea {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+msgid "Error"
+msgstr "Eroare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
+msgid "Choose a predefined license"
+msgstr "Alegeţi o licenţă predefinită"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Do nothing"
+msgstr "Nu fă nimic"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Report Bug"
+msgstr "Raportează eroarea"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:40
+msgid ""
+"An unexpected exception occoured.\n"
+"\n"
+"This is always a coding error. If you are running the latest\n"
+"version of JOSM, please consider be kind and file a bug report."
+msgstr ""
+"A avut loc o excepţie netratată.\n"
+"\n"
+"Aceasta este întotdeauna o eroare de programare. Dacă rulaţi ultima\n"
+"versiune de JOSM, vă rog fiţi amabil şi trimiteţi un raport de eroare."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
+msgid "Unexpected Exception"
+msgstr "Excepţie netratată"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+msgid ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+msgstr ""
+"Vă rog trimiteţi asta la josm@eigenhaimstrasse.de\n"
+"\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Vă rog trimiteţi un email cu următoarele informaţii la josm@eigenheimstrasse."
+"de"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+msgid "Ctrl-"
+msgstr "Ctrl-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Alt-"
+msgstr "Alt-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "Shift-"
+msgstr "Shift-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+msgid "Load Selection"
+msgstr "Încarcă selecţia"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contactez {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+msgid "Downloading..."
+msgstr "Descarc..."
+
+#: /home/imi/src/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}\""
+
+#: /home/imi/src/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}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+msgid "Current Selection"
+msgstr "Selecţia curentă"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Select"
+msgstr "Selectaţi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
+msgid "Reload"
+msgstr "Reîncarcă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+msgid "Refresh the selection list."
+msgstr "Reîncarcă lista de selecţii"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
+msgid "Search"
+msgstr "Căutare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
+msgid "Search for objects."
+msgstr "Caută obiecte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+msgid "Please enter a search string."
+msgstr "Vă rog introduceţi un şir de căutat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Căutare în întreg textul.<ul><li><code>Bulevardul Unirii</code>  - "
+"'Bulevardul' şi 'Unirii' în orice cheie sau nume.</li><li><code>\"Bulevardul "
+"Unirii\"</code>  - 'Bulevardul Unirii' în orice cheie sau nume.</"
+"li><li><code>name:Uni</code>  - 'Uni' oriunde în nume.</li><li><code>-name:"
+"Uni</code>  - nu există 'Uni' în nume.</li><li><code>foot:</code>  - cheia "
+"foot are orice valoare.</ul></html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+msgid "replace selection"
+msgstr "Înlocuieşte selecţia"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+msgid "add to selection"
+msgstr "adaugă la selecţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
+msgid "remove from selection"
+msgstr "elimină din selecţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr "Conflict"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr "Îmbin conflictele."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Rezolvă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Deschide un dialog de îmbinare a tuturor elementelor selectate din lista de "
+"mai sus."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+msgid "Please select something from the conflict list."
+msgstr "Vă rog selectaţi ceva din lista de conflicte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+msgid "Resolve Conflicts"
+msgstr "Rezolvare conflicte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Stivă comenzi"
+
+#: /home/imi/src/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)."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
+msgid "Delete the selected layer."
+msgstr "Şterge stratul selectat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+msgid "Show/Hide"
+msgstr "Arată/Ascunde"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
+msgid "Layers"
+msgstr "Straturi"
+
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Se va modifica {0} obiect."
+msgstr[1] "Se vor modifica {0} obiecte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+msgstr ""
+"Vă rog selectaţi o valoare nouă pentru \"{0}\".<br>(Un şir gol va şterge "
+"cheia.)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
+msgid "Change values?"
+msgstr "Schimb valorile?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+msgid "<different>"
+msgstr "<diferit>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+msgid "Please select a key"
+msgstr "Vă rog selectaţi o cheie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+msgid "Please select a value"
+msgstr "Vă rog selectaţi o valoare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+msgid "Properties"
+msgstr "Proprietăţi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+msgid "Property for selected objects."
+msgstr "Proprietăţi ale obiectelor selectate."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
+#, java-format
+msgid "Could not read annotation preset source: {0}"
+msgstr "Nu am putut citi sursa prestabilită de adnotări: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Eroare la prelucrarea {0}: "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Schimb {0} obiect"
+msgstr[1] "Schimb {0} obiecte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Key"
+msgstr "Cheie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Value"
+msgstr "Valoare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+msgid "Please select the row to edit."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
+msgid "Please select the row to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+msgid "Add a new key/value pair to all objects"
+msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
+msgid "Edit"
+msgstr "Editare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+msgid "Edit the value of the selected key for all objects"
+msgstr "Editează valoarea cheii selectata pentru toate obiectele"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+msgid "Delete the selected key in all objects"
+msgstr "Şterge cheia selectată din toate obiectele"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Revert"
+msgstr "Anulează"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr "Istoric"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr "Afişează istoricul tuturor elementelor selectate."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Obiect"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr "Dată"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "nod"
+msgstr[1] "noduri"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "segment"
+msgstr[1] "segmente"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "cale"
+msgstr[1] "căi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+msgid "There were conflicts during import."
+msgstr "Au existat conflicte în timpul importului."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} constă în:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} şters.)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+msgid "Convert to data layer"
+msgstr "Converteşte la strat de date"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "urmă"
+msgstr[1] "urme"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
+msgid "point"
+msgid_plural "points"
+msgstr[0] "punct"
+msgstr[1] "puncte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "o urmă cu {0} punct"
+msgstr[1] "o urmă cu {0} puncte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#, java-format
+msgid "{0} consists of {1} track"
+msgstr "{0} format din {1} urmă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} punct"
+msgstr[1] "{0} puncte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+msgid "Customize Color"
+msgstr "Personalizează culoarea"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+msgid "OK"
+msgstr "OK"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
+msgid "Cancel"
+msgstr "Renunţă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+msgid "Default"
+msgstr "Implicit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
+msgid "Choose a color"
+msgstr "Alegeţi o culoare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Import images"
+msgstr "Importă imagini"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
+msgid "JPEG images (*.jpg)"
+msgstr "Imagine JPEG (*.jpg)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
+msgid "Images"
+msgstr "Imagini"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
+msgid "Read GPS..."
+msgstr "Citire GPS..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Nu există timp pentru punctul {0} x {1}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
+msgid "Time loop in gps data."
+msgstr "Buclă de timp în datele gps."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
+msgid "No images with readable timestamps found."
+msgstr "Nu am găsit imagini cu mărci de timp citibile."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#, java-format
+msgid "Reading {0}..."
+msgstr "Citesc {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+msgid "Geotagged Images"
+msgstr "Imagini geoetichetate"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Sfârşit GPS: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#, java-format
+msgid "current delta: {0}s"
+msgstr "diferentă curentă: {0}s"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+msgid "timezone difference: "
+msgstr "diferenţă zonă de timp: "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagine"
+msgstr[1] "imagini"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} în urmă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "Sync clock"
+msgstr "Sincronizare ceas"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Nu există timp EXIF în fişierul \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
+msgid "Image"
+msgstr "Imagine"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
+msgid "GPS unit timezome (difference to photo)"
+msgstr "Zona de timp a unităţii GPS (diferenţă faţă de fotografie)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
+msgid "Syncronize Time with GPS Unit"
+msgstr "Sincronizare timp cu unitatea GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
+msgid "Time entered could not be parsed."
+msgstr "Timpul introdus nu a putut fi interpretat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:46
+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}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "Stratul WMS: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+msgid "Could not read bookmarks."
+msgstr "Nu am putut citi semnele de carte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+msgid "Could not write bookmark."
+msgstr "Nu am putut scrie semnele de carte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
+msgid "Java Open Street Map - Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
+msgid "layer not in list."
+msgstr "stratul nu este în listă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Indiciu: Anumite modificări au apărut în urma transmiterii de date noi la "
+"server."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+msgid "There are unsaved changes. Really quit?"
+msgstr "Există modificăre nesalvate. Într-adevăr ieşiţi?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
+msgid "Unsaved Changes"
+msgstr "Modificări nesalvate"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap Editor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "usage"
+msgstr "utilizare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
+msgid "options"
+msgstr "opţiuni"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Show this help"
+msgstr "Arată acest ajutor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Standard unix geometry argument"
+msgstr "Argument geometrie unix standard"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Download the bounding box"
+msgstr "Descarcă perimetrul selectat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
+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)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr "Deschide fişierul (ca gps brut, dacă .gpx sau .csv)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
+msgid "Download the bounding box as raw gps"
+msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgid "Select with the given search"
+msgstr "Selectează cu căutarea dată"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
+msgid "Don't launch in fullscreen mode"
+msgstr "Nu porni pe întreg ecranul"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
+msgid "Reset the preferences to default"
+msgstr "Restabileşte preferinţele implicite"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
+msgid "Set the language. Example: "
+msgstr "Precizează limba. Exemplu: "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "examples"
+msgstr "exemple"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Parametrii sunt citiţi în ordinea în care sunt specificaţi, deci asiguraţi-"
+"vă\n"
+"că aţi încărcat date înainte de --selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:221
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#, java-format
+msgid "{0} object has conflicts:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} obiect are conflicte:"
+msgstr[1] "{0} obiecte au conflicte:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+msgid "my version:"
+msgstr "versiunea mea:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+msgid "their version:"
+msgstr "versiunea lor:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+msgid "resolved version:"
+msgstr "rezolvat în versiunea:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+msgid "Contacting the OSM server..."
+msgstr "Contactez serverul OSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+msgid "Error while parsing"
+msgstr "Eroare la prelucrare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+msgid "File Not found"
+msgstr "Fişierul nu a fost găsit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+msgid "string"
+msgstr "şir"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+msgid "Name of the user."
+msgstr "Numele utilizatorului."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+msgid "OSM Password."
+msgstr "Parola OSM."
+
+#: /home/imi/src/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)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
+msgid "string;string;..."
+msgstr "şir;şir;..."
+
+#: /home/imi/src/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 "
+"filename"
+msgstr ""
+"Descarcă pe fiecare. Poate fi x1,y1,x2,y2 o adresă conţinând "
+"lat=y&lon=x&zoom=z sau un nume de fişier"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Descarcă pe fiecare ca gps neprelucrat. Poate fi x1,y1,x2,y2 sau o adresă "
+"conţinând lat=x&lon=y&zoom=z sau un nume de fişier"
+
+#: /home/imi/src/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 "
+"url which returns osm-xml"
+msgstr ""
+"Adaugă pe fiecare la selecţia iniţială. Poate fi un şir de căutare tip "
+"google sau o adresă care întoarce osm-xml"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "any"
+msgstr "oricare"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
+msgid "Username"
+msgstr "Nume utilizator"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
+msgid "Password"
+msgstr "Parolă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
+msgid "OptionPane.okButtonText"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
+msgid "OptionPane.cancelButtonText"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
+msgid "Draw lines between raw gps points."
+msgstr "Trasează linii între puncte gps neprelucrate"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
+msgid "Force lines if no segments imported."
+msgstr "Forţează linii dacă nu a fost importat nici un segment."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
+msgid "Draw large GPS points."
+msgstr "Desenează puncte GPS mari."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
+msgid "Draw Direction Arrows"
+msgstr "Desenează săgeţi direcţionale"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Forţează desenarea liniilor dacă datele importate nu conţin informatii "
+"despre linii."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
+msgid "Draw larger dots for the GPS points."
+msgstr "Desenează puncte mai pari pentru punctele GPS."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
+msgid "Draw direction hints for all segments."
+msgstr "Desenează indicii despre direcţie pentru toate segmentele."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+msgid "Color"
+msgstr "Culoare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
+msgid "Name"
+msgstr "Nume"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
+msgid "Choose"
+msgstr "Alegeţi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+msgid "Please select a color."
+msgstr "Vă rog selectaţi o culoare."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Alegeţi o culoare pentru {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
+msgid "Annotation preset source"
+msgstr "Sursă predefinită de adnotări"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+msgid "The base URL to the OSM server (REST API)"
+msgstr "Adresa de bază pentru serverul OSM (API REST)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
+msgid "Login name (email) to the OSM account."
+msgstr "Nume autentificare (email) pentru contul OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
+"nici o parolă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>Specificaţii pentru formatul şirului de import. lat/lon şi timp sunt "
+"importate.<br><b>lat</b>: Coordonata latitudine<br><b>lon</b>: Coordonata "
+"longitudine<br><b>time</b>: Timpul măsurat, ca şir<br><b>ignore</b>: Sări "
+"peste acest câmp<br>Un exemplu: \"ignore ignore lat lon\" va folosi ' ' ca "
+"delimitare, va sări peste primele două valori şi apoi va citi lat/lon."
+"<br>Alt examplu: \"lat,lon\" va citi doar valorile lat/lon separate prin "
+"virgulă.</html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
+msgid ""
+"If your gps device draw to few lines, select this to draw lines along your "
+"way."
+msgstr ""
+"Dacă dispozitivul gps a desenat prea puţine linii, selectaţi această opţiune "
+"pentru a desena linii pe cale."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
+msgid "Colors used by different objects in JOSM."
+msgstr "Culori utilizate de diferite obiecte în JOSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
+msgid ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+msgstr ""
+"Sursele (adresă sau nume de fişier) ale fişierelor cu adnotări predefinite. "
+"Vedeţi http://josm.eigenheimstrasse.de/wiki/AnnotationPresets pentru ajutor."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
+msgid "Add a new annotation preset source to the list."
+msgstr "Adaugă o nouă sursă de adnotări predefinite la listă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+msgid "Delete the selected source from the list."
+msgstr "Şterge sursele selectate din listă."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+msgid "Display Settings"
+msgstr "Configurări afişare"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Diferite opţiuni care influenţează reprezentarea vizuală a întregului "
+"program."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
+msgid "Look and Feel"
+msgstr "Aspect"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
+msgid "Language"
+msgstr "Limbă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+msgid "Colors"
+msgstr "Culori"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+msgid "Connection Settings"
+msgstr "Configurări conexiune"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+msgid "Connection Settings to the OSM server."
+msgstr "Configurări conexiune la serverul OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
+msgid "Base Server URL"
+msgstr "Adresă server principal"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+msgid "OSM username (email)"
+msgstr "Nume utilizator OSM (email)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
+msgid "OSM password"
+msgstr "Parola OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ATENŢIE: Parola este păstrată în format text clar în fişierul de "
+"preferinţe.<br>Parola este transferată în text clar către server, codată în "
+"adresă.<br><b>Nu folosiţi o parolă importantă.</b></html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+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)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
+msgid "Map Settings"
+msgstr "Opţiuni hartă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
+msgid "Settings for the map projection and data interpretation."
+msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
+msgid "Projection method"
+msgstr "Metodă de proiecţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+msgid "Annotation preset sources"
+msgstr "Surse de adnotări predefinite"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr "Tip necunoscut la linia {0}"
+
+#: /home/imi/src/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})"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "element"
+msgstr[1] "elemente"
+
+#: /home/imi/src/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}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr "Modificare proprietăţi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+msgid "Conflicts in disjunct objects"
+msgstr "Conflicte în obiecte disjuncte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#, java-format
+msgid "Downloading {0} {1}"
+msgstr "Descarc {0} {1}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:98
+msgid "Unknown version"
+msgstr "Versiune necunoscută"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr "Am găsit eticheta <seg> pe o non-cale."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr "Segment incomplet cu id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr "Excepţie pointer nul. Posibil lipsesc nişte etichete."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr "Obiect ilegal cu id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr "Nu am putut citi formatul de timp \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr "Lipseşte atributul necesar \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr "Pregătesc datele..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr "Note id malformat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Transmit {0} {1} ({2})..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+msgid "Unknown host"
+msgstr "Gazdă necunoscută"
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+msgid ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in Preferences."
+msgstr ""
+"Şirul de format al datelor este incomplet sau nu a putut fi găsit. Încercaţi "
+"să precizaţi manual un şir de format în Preferinţe."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+msgid ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+msgstr ""
+"Şirul de format este incomplet. E necesar să fie specificate cel puţin 'lat' "
+"şi 'lon'"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Tip de date necunoscut: \"{0}\"."
+
+#: /home/imi/src/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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Eroare de prelucrare la linia {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Descarc punctele {0} până la {1}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
+msgid "Downloading OSM data..."
+msgstr "Descarc datele OSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
+msgid "Incorrect password or username."
+msgstr "Parolă sau nume utilizator incorecte."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Atenţie: Parola este transferată necriptată."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+msgid "Save user and password (unencrypted)"
+msgstr "Salvează nume utilizator şi parolă (necriptate)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
+msgid "Enter Password"
+msgstr "Introduceţi parola"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
+msgid "Aborting..."
+msgstr "Anulez..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Eroare la prelucrare."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "poziţie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "diferit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "şters"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "adevărat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "fals"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "nici unul"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "segmente"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "la"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "de la"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr "nou"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr "necunoscut"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} nod"
+msgstr[1] "{0} noduri"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr "incomplet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
+msgid "background"
+msgstr "fundal"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+msgid "incomplete way"
+msgstr "cale incompletă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+msgid "selected"
+msgstr "selectat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+msgid "gps point"
+msgstr "punct gps"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "scale"
+msgstr "scală"
+
+#: /home/imi/src/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"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Schimbă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Elimină \"{0}\" pentru"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Stabileşte {0}={1} pentru"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "obiect"
+msgstr[1] "obiecte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
+msgid "Annotation Preset Tester"
+msgstr "Tester de adnotări predefinite"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
+msgid "Files"
+msgstr "Fişiere"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
+msgid "Connection"
+msgstr "Conexiune"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
+msgid "Layer"
+msgstr "Strat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
+msgid "Help"
+msgstr "Ajutor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
+msgid "unnamed"
+msgstr "fără nume"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
+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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignor adresa malformată: \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignor adresa malformată către fişier: \"{0}\""
Index: /src/org/openstreetmap/josm/Main.java
===================================================================
--- /src/org/openstreetmap/josm/Main.java	(revision 132)
+++ /src/org/openstreetmap/josm/Main.java	(revision 133)
@@ -152,5 +152,5 @@
 				String annotationSources = pref.get("annotation.sources");
 				if (annotationSources.equals("")) {
-					JOptionPane.showMessageDialog(Main.parent, "You have to specify annotation sources in the preferences first.");
+					JOptionPane.showMessageDialog(Main.parent, tr("You have to specify annotation sources in the preferences first."));
 					return;
 				}
Index: /src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 132)
+++ /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 133)
@@ -55,4 +55,11 @@
 public class PreferenceDialog extends JDialog {
 
+	private final class RequireRestartAction implements ActionListener {
+	    public void actionPerformed(ActionEvent e) {
+	    	requiresRestart = true;
+	    }
+    }
+	private RequireRestartAction requireRestartAction = new RequireRestartAction();
+
 	/**
 	 * Action to take place when user pressed the ok button.
@@ -132,5 +139,10 @@
 	 */
 	private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
-	private JComboBox languages = new JComboBox(new Locale[]{new Locale("en", "US"), new Locale("en", "GB"), Locale.GERMAN, Locale.FRENCH});
+	private JComboBox languages = new JComboBox(new Locale[]{
+			new Locale("en", "US"), 
+			new Locale("en", "GB"), 
+			Locale.GERMAN, 
+			Locale.FRENCH,
+			new Locale("ro", "RO")});
 	/**
 	 * The main tab panel.
@@ -201,9 +213,5 @@
 			}
 		});
-		lafCombo.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				requiresRestart = true;
-			}
-		});
+		lafCombo.addActionListener(requireRestartAction);
 
 		// language
@@ -220,4 +228,5 @@
             }
 		});
+		languages.addActionListener(requireRestartAction);
 
 		// projection combo box
@@ -228,9 +237,5 @@
 			}
 		}
-		projectionCombo.addActionListener(new ActionListener(){
-			public void actionPerformed(ActionEvent e) {
-				requiresRestart = true;
-			}
-		});
+		projectionCombo.addActionListener(requireRestartAction);
 
 		drawRawGpsLines.addActionListener(new ActionListener(){