Index: /build.xml
===================================================================
--- /build.xml	(revision 112)
+++ /build.xml	(revision 113)
@@ -63,5 +63,7 @@
         </exec>
         <apply executable="msgmerge">
-        	<arg line="-U ${build}/keys.pot"/>
+        	<arg value="-U"/>
+			<srcfile/>
+        	<arg file="${build}/keys.pot"/>
         	<fileset dir="${po}">
         		<include name="*.po"/>
Index: /po/de.po
===================================================================
--- /po/de.po	(revision 112)
+++ /po/de.po	(revision 113)
@@ -6,5 +6,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-25 19:22+0200\n"
+"POT-Creation-Date: 2006-07-17 02:43+0200\n"
 "PO-Revision-Date: 2006-07-16 23:44+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -12,283 +12,254 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
 msgid "Add segment"
 msgstr "Abschnitt hinzufügen"
 
-#: org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
 msgid "Add a segment between two nodes."
 msgstr "Abschnitt zwischen zwei Kontenpunkten hinzufügen"
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:55
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247
+#: /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/command/DeleteCommand.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
 msgid "Delete"
 msgstr "Löschen"
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:60
+#: /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"
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
-#, java-format
-msgid "Cannot delete node. {0}"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+#, fuzzy
+msgid "Cannot delete node."
 msgstr "Kann den Knotenpunkt {0} nicht löschen"
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:157
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
 msgid "This object is in use."
 msgstr "Das Objekt wird benutzt."
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:174
+#: /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."
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:179
+#: /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."
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:189
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
 msgid "Used in a way."
 msgstr "Wird in einem Weg benutzt."
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:191
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
 msgid "Wrong direction of segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:194
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr "Schlüsselkonflikt"
 
-#: org/openstreetmap/josm/actions/mapmode/DeleteAction.java:204
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
 msgid "Delete Node"
 msgstr "Knotenpunkt löschen"
 
-#: org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
 msgstr "Zoom"
 
-#: org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
 msgstr "Zommen durch ziehen  (Strg-Hoch,Links,Runter,Rechts,+,-)"
 
-#: org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
 msgid "Selection"
 msgstr "Auswählen"
 
-#: org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: /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."
 
-#: org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Straight line"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#, fuzzy
+msgid "Select objects in a straight line."
+msgstr "Wähle Objekte durch ziehen oder klicken."
+
+#: /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"
 
-#: org/openstreetmap/josm/actions/mapmode/MoveAction.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
 msgid "Move selected objects around."
 msgstr "Verschiebe markierte Objekte"
 
-#: org/openstreetmap/josm/actions/mapmode/MoveAction.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
 msgid "Cannot move objects outside of the world."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:63
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr "Weg hinzufügen"
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:63
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add a new way to the data."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:97
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:145
+#: /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 ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:165
+#: /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 ""
-
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:165
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:171
+#: /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 ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:171
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:176
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:176
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:235
-#, java-format
-msgid "Create a new way out of {0} segments?"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/mapmode/AddWayAction.java:235
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 msgid "Create new way"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add node"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:49
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add a new node to the map"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node into segment"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:50
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add a node into an existing segment"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:86
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
 msgid "Can not add a node outside of the world."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
 msgid "Add Node into Segment"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/PreferencesAction.java:25
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:173
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: org/openstreetmap/josm/actions/PreferencesAction.java:25
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
 msgid "Open a preferences page for global settings."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/PreferencesAction.java:25
-msgid "F12"
-msgstr "F12"
-
-#: org/openstreetmap/josm/actions/OpenAction.java:45
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr "Öffnen"
 
-#: org/openstreetmap/josm/actions/OpenAction.java:45
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/OpenAction.java:45
-msgid "Ctrl-O"
-msgstr "Strg-O"
-
-#: org/openstreetmap/josm/actions/OpenAction.java:76
-msgid ""
-"Warning: Soon, it will be no longer possible to open GPX files as osm data. "
-"Please convert your files to .osm format."
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:85
-#, java-format
-msgid ""
-"{0} seems to be an old 0.2 API XML file.\n"
-"JOSM can try to open it with the old parser. This option\n"
-"will not be available in future JOSM version. You should\n"
-"immediatly save the file, if successfull imported."
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:89
-msgid "Load as 0.2 API file?"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:98
-#, java-format
-msgid "{0}: CSV Data import for non-GPS data is not implemented yet."
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:101
-#, java-format
-msgid "{0}: Unknown file extension: {1}"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:104
-#: org/openstreetmap/josm/actions/DownloadAction.java:85
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, fuzzy, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Dateiendung unbekannt."
+
+#: /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"
 
-#: org/openstreetmap/josm/actions/OpenAction.java:108
-#: org/openstreetmap/josm/actions/OpenAction.java:111
-#, java-format
-msgid "Error while parsing {0}: {1}"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:114
-#, java-format
-msgid ""
-"Could not read '{0}'\n"
-"{1}"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/OpenAction.java:128
-#, java-format
-msgid "Do you want to open {0} as raw gps data?"
-msgstr "Soll {0} als GPS-Daten geöffnet werden?"
-
-#: org/openstreetmap/josm/actions/OpenAction.java:129
-msgid "Open as raw data?"
-msgstr "Als Roh-Daten öffnen?"
-
-#: org/openstreetmap/josm/actions/UndoAction.java:28
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, fuzzy, java-format
+msgid "Error while parsing {0}"
+msgstr "Beim speichern ist ein Fehler aufgetreten. {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: org/openstreetmap/josm/actions/UndoAction.java:28
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UndoAction.java:28
-msgid "Ctrl-Z"
-msgstr "Strg-Z"
-
-#: org/openstreetmap/josm/actions/DownloadAction.java:71
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
 msgid "Downloading data"
 msgstr "Hole Daten aus dem Internet"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:84
+#: /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."
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:99
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:129
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
 msgid "Open as raw gps data"
 msgstr "Als GPS-Daten öffnen"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
 msgid "Download from OSM"
 msgstr "Von OSM laden"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:132
+#: /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"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:132
-msgid "Ctrl-Shift-D"
-msgstr "Strg-Shift-D"
-
-#: org/openstreetmap/josm/actions/DownloadAction.java:145
+#: /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 "
@@ -298,237 +269,276 @@
 "ladenden Bereich durch einfügen."
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:148
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
 msgid "Bounding box"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:149
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
 msgid "min lat"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:151
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
 msgid "min lon"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
 msgid "max lat"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
 msgid "max lon"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:167
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
 msgid "URL from www.openstreetmap.org"
 msgstr "URL von www.openstreetmap.org"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:220
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:237
+#: /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/command/AddCommand.java:52
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:242
+#: /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."
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:245
+#: /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."
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
 msgid "Remove"
 msgstr "Entfernen"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:258
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie ein Lesezeichen."
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:276
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
 msgid "Choose an area"
 msgstr "Bereich auswählen"
 
-#: org/openstreetmap/josm/actions/DownloadAction.java:291
+#: /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."
 
-#: org/openstreetmap/josm/actions/ExitAction.java:20
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr "Beenden"
 
-#: org/openstreetmap/josm/actions/ExitAction.java:20
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/AboutAction.java:42
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
 msgid "About"
 msgstr "Über"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:42
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:61
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
 msgid "Homepage"
 msgstr "Webseite"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+msgid "Bug Reports"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
 msgid "Revision"
 msgstr "Version"
 
-#: org/openstreetmap/josm/actions/AboutAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: org/openstreetmap/josm/actions/AboutAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
 
-#: org/openstreetmap/josm/actions/DiskAccessAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert. Überschreiben?"
 
-#: org/openstreetmap/josm/actions/DiskAccessAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: org/openstreetmap/josm/actions/AutoScaleAction.java:36
-#, java-format
-msgid "Auto Scale: {0} "
-msgstr ""
-
-#: org/openstreetmap/josm/actions/AutoScaleAction.java:37
-#, java-format
-msgid "Auto zoom the view to {0}. Disabled if the view is moved."
-msgstr ""
-
-#: org/openstreetmap/josm/actions/UploadAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#, fuzzy
+msgid "selection"
+msgstr "Auswählen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#, fuzzy
+msgid "layer"
+msgstr "Ebene"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+#, fuzzy
+msgid "conflict"
+msgstr "Konflikt"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload to OSM"
 msgstr "Zum OSM speichern"
 
-#: org/openstreetmap/josm/actions/UploadAction.java:40
+#: /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"
 
-#: org/openstreetmap/josm/actions/UploadAction.java:40
-msgid "Ctrl-Shift-U"
-msgstr "Strg-Shift-U"
-
-#: org/openstreetmap/josm/actions/UploadAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:78
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
 msgstr "Sende Daten"
 
-#: org/openstreetmap/josm/actions/UploadAction.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "No changes to upload."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:111
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to add:"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to modify:"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:127
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
 msgid "Objects to delete:"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/UploadAction.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
 msgid "Upload this changes?"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
-#, java-format
-msgid "OSM Server Version {0} (.osm .xml)"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/ExtensionFileFilter.java:29
-#, java-format
-msgid "GPX Files Version {0} (.gpx)"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/ExtensionFileFilter.java:30
-#, java-format
-msgid "CSV Files Version {0} (.csv .txt)"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/RedoAction.java:27
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: org/openstreetmap/josm/actions/RedoAction.java:27
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo the last undone action."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/RedoAction.java:27
-msgid "Ctrl-Shift-Z"
-msgstr "Strg-Shift-Z"
-
-#: org/openstreetmap/josm/actions/WmsServerAction.java:17
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
+#, fuzzy, java-format
+msgid "Downloading {0} segments"
+msgid_plural "Downloading {0} segment"
+msgstr[0] "Hole Daten aus dem Internet"
+msgstr[1] "Hole Daten aus dem Internet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download incomplete objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+#, fuzzy
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr "Kartendaten vom OSM Server laden"
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+#, fuzzy
+msgid "Download?"
+msgstr "Hole Daten aus dem Internet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
 msgid "Show background"
 msgstr "Hintergrund anzeigen"
 
-#: org/openstreetmap/josm/actions/WmsServerAction.java:17
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
 msgid "Download and show landsat background images."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/WmsServerAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
 msgid "Not implemented yet."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
 msgid "Save"
 msgstr "Speichern"
 
-#: org/openstreetmap/josm/actions/SaveAction.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
 msgid "Save the current data."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:38
-msgid "Ctrl-S"
-msgstr "Strg-S"
-
-#: org/openstreetmap/josm/actions/SaveAction.java:43
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
 msgid "No document open so nothing to save."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
 msgid "The document contains no data. Save anyway?"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: org/openstreetmap/josm/actions/SaveAction.java:50
+#: /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 "
@@ -536,121 +546,102 @@
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:50
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
 msgid "Conflicts"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:75
-msgid ""
-"Export of data containing incomplete ways to GPX is not implemented.\n"
-"Be aware, that in future versions of JOSM, GPX support will be kept at a "
-"minimum.\n"
-"Please use .osm or .xml as extension for the better OSM support."
-msgstr ""
-
-#: org/openstreetmap/josm/actions/SaveAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
 msgid "CSV output not supported yet."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/SaveAction.java:86
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: org/openstreetmap/josm/actions/SaveAction.java:93
-#, java-format
-msgid ""
-"An error occoured while saving.\n"
-"{0}"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
+#, fuzzy
+msgid "An error occoured while saving."
 msgstr ""
 "Beim speichern ist ein Fehler aufgetreten.\n"
 "{0}"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:42
-msgid ""
-"<html><font color='red' size='-2'>Note: GPL is not compatible to the OSM "
-"license. Do not upload GPL licensed tracks</html>"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:39
+#, fuzzy
+msgid ""
+"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"tracks."
 msgstr ""
 "<html><font color='red' size='-2'>Achtung: GPL ist nicht kompatibl zur OSM-"
 "Lizens. Keine Tracks die unter GPL stehen hochspielen.</html>"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid "Export to GPX"
 msgstr "In GPX exportieren"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid "Export the data to GPX file."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:47
-msgid "Ctrl-E"
-msgstr "Strg-E"
-
-#: org/openstreetmap/josm/actions/GpxExportAction.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "gps track description"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
 msgid "Add author information"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:82
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
 msgid "Real name"
 msgstr "Voller Name"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:86
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
 msgid "Email"
 msgstr "E-Mail"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:90
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:94
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
 msgid "Predefined"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
 msgid "Copyright year"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:104
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
 msgid "Keywords"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:108
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
 msgid "Export options"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:131
-#, java-format
-msgid ""
-"Error while exporting {0}:\n"
-"{1}"
-msgstr ""
-
-#: org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#, fuzzy, java-format
+msgid "Error while exporting {0}"
+msgstr "Beim speichern ist ein Fehler aufgetreten. {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
 msgid "Error"
 msgstr ""
 
-#: org/openstreetmap/josm/actions/GpxExportAction.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
 msgid "Choose a predefined license"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/DateParser.java:31
-msgid "No applicable parse format"
-msgstr ""
-
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
 msgid "Do nothing"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
 msgid "Report Bug"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:40
 msgid ""
 "An unexpected exception occoured.\n"
@@ -660,9 +651,9 @@
 msgstr ""
 
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
 msgid "Unexpected Exception"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:48
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "Please send this to josm@eigenheimstrasse.de\n"
@@ -670,16 +661,5 @@
 msgstr ""
 
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
-msgid "Development version. Unknown revision."
-msgstr ""
-
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:56
-#, java-format
-msgid ""
-"\n"
-"Main.class build on {0}\n"
-msgstr ""
-
-#: org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid ""
 "Please send an email with the following information to josm@eigenheimstrasse."
@@ -687,70 +667,87 @@
 msgstr ""
 
-#: org/openstreetmap/josm/tools/ShortCutLabel.java:15
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr "Strg-"
 
-#: org/openstreetmap/josm/tools/ShortCutLabel.java:17
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
 msgid "Alt-"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/ShortCutLabel.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
 msgid "AltGr-"
 msgstr ""
 
-#: org/openstreetmap/josm/tools/ShortCutLabel.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
 msgid "Shift-"
 msgstr "Shift-"
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
-msgid "Could not read from url: '{0}'"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:94
-msgid "Parsing error in url: '{0}'"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:121
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65
+#, fuzzy
+msgid "Load Selection"
+msgstr "Auswählen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#, java-format
+msgid "Contact {0}..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+#, fuzzy
+msgid "Downloading..."
+msgstr "Hole GPS-Daten"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#, java-format
+msgid "Could not read from url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:92
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
 msgid "Current Selection"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:121
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
 msgid "Open a selection list window."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 #, fuzzy
 msgid "Select"
 msgstr "Auswählen"
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:136
+#: /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 ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
 msgid "Refresh the selection list."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:189
+#: /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 ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
 msgid "Search for objects."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
 msgid "Please enter a search string."
 msgstr "Bitte geben Sie einen Suchbegriff ein."
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: /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 "
@@ -761,338 +758,403 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:171
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
 msgid "remove from selection"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr "Lösen"
 
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68
+#: /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 ""
 
-#: org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
 msgid "Please select something from the conflict list."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#, fuzzy
+msgid "Resolve Conflicts"
+msgstr "Konflikt"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
 msgid "Command Stack"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
 msgid "Open a list of all commands (undo buffer)."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:56
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
 msgid "Delete the selected layer."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
 msgid "Show/Hide"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:81
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
 msgid "Layers"
 msgstr "Ebenen"
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
 msgid "Open a list of all loaded layers."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:195
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Reihe höher schieben"
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:200
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
 msgid "Move the selected layer one row down."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/LayerList.java:213
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:91
-#, java-format
-msgid ""
-"<html>This will change {0} object.<br><br> Please select a new value for "
-"'{1}'.<br>(Empty string deletes the key.)"
-"<html>This will change {0} objects.<br><br> Please select a new value for "
-"'{1}'.<br>(Empty string deletes the key.</html>)"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:103
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165
+#: /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
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+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:161
 msgid "Change values?"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
-#, java-format
-msgid "<html>This will change {0} object.<br>br>Please select a key"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#: /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 ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
 msgid "Properties"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
 msgid "Property for selected objects."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:219
-msgid "<different>"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: org/openstreetmap/josm/Main.java:154
+#: /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
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
 msgid "Please select the row to edit."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
 msgid "Please select the row to delete."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:255
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:256
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/OsmDataLayer.java:56
+#: /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/command/MoveCommand.java:117
 msgid "node"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/OsmDataLayer.java:56
+msgid_plural "nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /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
+#, fuzzy
 msgid "segment"
-msgstr "Abschnitt"
-
-#: org/openstreetmap/josm/gui/layer/OsmDataLayer.java:56
+msgid_plural "segments"
+msgstr[0] "Abschnitt"
+msgstr[1] "Abschnitt"
+
+#: /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
 msgid "way"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
-#, java-format
-msgid "{0} nodes, {1} segments, {2} streets."
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+msgid_plural "ways"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
 msgid "There were conflicts during import."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:52
-msgid "Convert layer to OSM"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
-#, java-format
-msgid "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;a track with {0} points<br>"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#, java-format
-msgid "<html>{0} consists of {1} tracks ({2} points)<br>{3}"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+msgid "Convert to data layer"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:133
+msgid "point"
+msgid_plural "points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#, java-format
+msgid "{0} consists of {1} track"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:163
 msgid "Customize Color"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
 msgid "OK"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:170
-#: org/openstreetmap/josm/gui/PleaseWaitRunnable.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
 msgid "Cancel"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:171
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
+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
 msgid "JPEG images (*.jpg)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:86
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
 msgid "Images"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
 msgid "Read GPS..."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
-#, java-format
-msgid "No time for point {0},{1}"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:104
-#, java-format
-msgid "Cannot read time from point {0},{1}"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:108
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
 msgid "Time loop in gps data."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
-msgid "Incorrect date information"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
 msgid "No images with readable timestamps found."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:129
-#, java-format
-msgid "Reading {0}...."
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+msgid "Geotagged Images"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:259
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
 #, java-format
 msgid "current delta: {0}s"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:260
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
 msgid "timezone difference: "
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
-#, java-format
-msgid "{0} images {1} within the track."
-msgstr ""
-
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, fuzzy
+msgid "image"
+msgid_plural "images"
+msgstr[0] "Bild"
+msgstr[1] "Bild"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
 msgid "Sync clock"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:372
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#, 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
+#, 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
 msgid "Image"
 msgstr "Bild"
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "GPS unit timezome (difference to photo)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 msgid "Syncronize Time with GPS Unit"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/GeoImageLayer.java:401
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
 msgid "Time entered could not be parsed."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/layer/WmsServerLayer.java:45
+#: /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 ""
 
-#: org/openstreetmap/josm/gui/layer/WmsServerLayer.java:56
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
 #, java-format
 msgid "WMS layer: {0}"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/BookmarkList.java:117
-#, java-format
-msgid ""
-"Could not write bookmark.\n"
-"{0}"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/MapView.java:162
-#, java-format
-msgid "{0}Java Open Street Map - Editor"
-msgstr "{0}Java OpenStreetMap - Editor "
-
-#: org/openstreetmap/josm/gui/MapView.java:200
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+#, fuzzy
+msgid "Could not read bookmarks."
+msgstr "Bitte wählen Sie ein Lesezeichen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+msgid "Could not write bookmark."
+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
+msgid "Java Open Street Map - Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:199
 msgid "layer not in list."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplication.java:52
-msgid ""
-"\n"
-"Hint: Some changes came from uploading new data to the server."
-msgstr ""
-
-#: org/openstreetmap/josm/gui/MainApplication.java:54
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:51
+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
 msgid "There are unsaved changes. Really quit?"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplication.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
 msgid "Unsaved Changes"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplication.java:75
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:74
 #, fuzzy
 msgid ""
@@ -1164,81 +1226,76 @@
 "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#: org/openstreetmap/josm/gui/MainApplication.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:101
 #, java-format
 msgid "Cannot open preferences directory: {0}"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplication.java:124
-msgid "Java Open Street Map - Editor"
-msgstr "Java OpenStreetMap - Editor "
-
-#: org/openstreetmap/josm/gui/MapStatus.java:220
-msgid "Lat/Lon "
-msgstr ""
-
-#: org/openstreetmap/josm/gui/MapStatus.java:222
-msgid " Object "
-msgstr ""
-
-#: org/openstreetmap/josm/gui/ConflictResolver.java:165
-#, java-format
-msgid ""
-"No conflicts but in conflict list:\n"
-"{0}"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/ConflictResolver.java:234
-#, java-format
-msgid "{0} object has confilicts:"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/ConflictResolver.java:237
+#: /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 ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/ConflictResolver.java:239
-#: org/openstreetmap/josm/gui/ConflictResolver.java:245
-msgid "down"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/ConflictResolver.java:243
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/ConflictResolver.java:248
-msgid "up"
-msgstr ""
-
-#: org/openstreetmap/josm/gui/ConflictResolver.java:249
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PleaseWaitRunnable.java:45
-msgid "Contact OSM server..."
-msgstr ""
-
-#: org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
-#: org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
-#, java-format
-msgid "Error while parsing: {0}"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+#, fuzzy
+msgid "Contacting the OSM server..."
+msgstr "Kartendaten zum OSM Server speichern"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+#, fuzzy
+msgid "Error while parsing"
 msgstr "Beim speichern ist ein Fehler aufgetreten. {0}"
 
-#: org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
-msgid "Not found: "
-msgstr ""
-
-#: org/openstreetmap/josm/gui/MainApplet.java:36
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+#, fuzzy
+msgid "File Not found"
+msgstr "Datei wurde nicht gefunden."
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplet.java:37
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplet.java:38
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: 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 ""
+
+#: /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 "
@@ -1246,5 +1303,5 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplet.java:40
+#: /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 "
@@ -1252,5 +1309,5 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplet.java:41
+#: /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 "
@@ -1258,65 +1315,96 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/MainApplet.java:42
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "any"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:62
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
 msgid "OptionPane.okButtonText"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:89
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:103
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:100
 msgid "OptionPane.cancelButtonText"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:157
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:154
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:158
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:222
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:219
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:225
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:222
 #, fuzzy
 msgid "Draw direction hints for all segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:262
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+msgid "Color"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:238
+msgid "Name"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
 #, fuzzy
 msgid "Choose"
 msgstr "Bereich auswählen"
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+msgid "Please select a color."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:268
+#, fuzzy, java-format
+msgid "Choose a color for {0}"
+msgstr "Farbe auswählen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:279
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:276
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:280
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:281
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:282
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1328,5 +1416,5 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:289
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:286
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1334,13 +1422,13 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:290
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:295
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
 msgid "Display Settings"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:295
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1348,34 +1436,34 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:293
 msgid "Look and Feel"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:302
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:299
 msgid "Colors"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 msgid "Connection Settings"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
 #, fuzzy
 msgid "Connection Settings to the OSM server."
 msgstr "Kartendaten zum OSM Server speichern"
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:310
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
 msgid "Base Server URL"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
 msgid "OSM username (email)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:314
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
 msgid "OSM password"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:316
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1384,277 +1472,360 @@
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:325
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:322
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "Map Settings"
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: org/openstreetmap/josm/gui/PreferenceDialog.java:331
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
 msgid "Projection method"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmReaderOld.java:53
-msgid "NumberFormatException. Probably a tag is missing."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReaderOld.java:55
-msgid "NullPointerException. Probably a tag name mismatch."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReaderOld.java:75
-#, java-format
-msgid "Illegal lat or lon value: {0}/{1}"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReaderOld.java:141
-msgid "The 'from' or 'to' object has not been transfered before."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReaderOld.java:229
-#, java-format
-msgid "Unknown object reference: {0}"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReaderOld.java:239
-msgid "Unknown segment reference: "
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReader.java:99
-#, fuzzy
-msgid "Unknown version."
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+msgid "Conflicts in disjunct objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#, fuzzy, java-format
+msgid "Downloading {0} {1}"
+msgstr "Hole Daten aus dem Internet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
+msgid "Got more than one object when expecting only one."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:98
+#, fuzzy
+msgid "Unknown version"
 msgstr "Dateiendung unbekannt."
 
-#: org/openstreetmap/josm/io/OsmReader.java:101
-#, fuzzy, java-format
-msgid "Unknown version {0}"
-msgstr "Dateiendung unbekannt."
-
-#: org/openstreetmap/josm/io/OsmReader.java:117
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
 msgid "Found <seg> tag on non-way."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmReader.java:120
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
 msgid "Incomplete segment with id=0"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmReader.java:129
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
 msgid "NullPointerException. Possible some missing tags."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmReader.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
 msgid "Illegal object with id=0"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmReader.java:153
-#, java-format
-msgid "Couldn't read time format '{0}'."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReader.java:168
-msgid "Missing required attirbute '{0}'."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmReader.java:215
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
 #, fuzzy
 msgid "Preparing data..."
 msgstr "Sende Daten"
 
-#: org/openstreetmap/josm/io/OsmReader.java:224
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
 msgid "Illformed Node id"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmServerWriter.java:74
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
 #, java-format
 msgid "Upload {0} {1} ({2})..."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmServerWriter.java:79
-#, fuzzy
-msgid "An error occoured: "
-msgstr ""
-"Beim speichern ist ein Fehler aufgetreten.\n"
-"{0}"
-
-#: org/openstreetmap/josm/io/OsmServerWriter.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+#, fuzzy
+msgid "Unknown host"
+msgstr "Dateiendung unbekannt."
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
 #, fuzzy, java-format
-msgid "upload to: {0}"
-msgstr "Zum OSM speichern"
-
-#: org/openstreetmap/josm/io/OsmServerWriter.java:176
-#, java-format
-msgid "got return: {0} with id {1}"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmServerWriter.java:188
-msgid "Unknown host: "
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawGpsReader.java:100
-#, java-format
-msgid "Data error: {0} value '{1}' is out of bound."
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmServerReader.java:59
+msgid "Unknown data type: \"{0}\"."
+msgstr "Dateiendung unbekannt."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+msgid "Maybe add an format string in preferences."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
 #, java-format
 msgid "Downloading points {0} to {1}..."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmServerReader.java:105
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
 #, fuzzy
 msgid "Downloading OSM data..."
 msgstr "Hole GPS-Daten"
 
-#: org/openstreetmap/josm/io/OsmServerReader.java:133
-#, java-format
-msgid "download: {0}"
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:42
-msgid "Could not detect data format string."
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:65
-msgid ""
-"Format string in data is incomplete or not found. Try setting an manual "
-"format string in Preferences."
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:66
-msgid ""
-"Format string is incomplete. Need at least 'lat' and 'lon' specification"
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:86
-msgid "Unknown data type: '{0}'."
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:86
-msgid " Maybe add an format string in preferences."
-msgstr ""
-
-#: org/openstreetmap/josm/io/RawCsvReader.java:91
-#, java-format
-msgid "Parsing error in line {0}"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmConnection.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
 msgid "Incorrect password or username."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmConnection.java:66
-msgid "Username"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmConnection.java:69
-msgid "Password"
-msgstr ""
-
-#: org/openstreetmap/josm/io/OsmConnection.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
 msgid "Warning: The password is transferred unencrypted."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmConnection.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Save user and password (unencrypted)"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmConnection.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Enter Password"
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmConnection.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
 msgid "Aborting..."
 msgstr ""
 
-#: org/openstreetmap/josm/io/OsmIdReader.java:34
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
 msgid "Error during parse."
 msgstr ""
 
-#: org/openstreetmap/josm/command/ConflictResolveCommand.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#, fuzzy
+msgid "deleted"
+msgstr "Löschen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#, fuzzy
+msgid "segments"
+msgstr "Abschnitt"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#, fuzzy
+msgid "background"
+msgstr "Hintergrund anzeigen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+msgid "incomplete way"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+#, fuzzy
+msgid "selected"
+msgstr "Löschen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+msgid "gps point"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
 msgstr ""
 
-#: org/openstreetmap/josm/command/DeleteCommand.java:48
-#: org/openstreetmap/josm/command/DeleteCommand.java:59
-#, java-format
-msgid "Delete {0} {1}"
-msgstr ""
-
-#: org/openstreetmap/josm/command/DeleteCommand.java:57
-msgid "primitive"
-msgstr ""
-
-#: org/openstreetmap/josm/command/ChangeCommand.java:40
-#, java-format
-msgid "Change {0} {1}"
-msgstr ""
-
-#: org/openstreetmap/josm/command/MoveCommand.java:118
-#, java-format
-msgid "Move {0} Node"
-msgstr ""
-
-#: org/openstreetmap/josm/command/SequenceCommand.java:55
-#, java-format
-msgid "Sequence: {0}"
-msgstr ""
-
-#: org/openstreetmap/josm/command/ChangePropertyCommand.java:68
-msgid "Remove '{0}'"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for"
 msgstr "Entferne '{0}'"
 
-#: org/openstreetmap/josm/command/ChangePropertyCommand.java:68
-#, java-format
-msgid "Set {0}={1} "
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, fuzzy, java-format
+msgid "Set {0}={1} for"
 msgstr "Setze {0}={1}"
 
-#: org/openstreetmap/josm/command/ChangePropertyCommand.java:69
-msgid "for"
-msgstr ""
-
-#: org/openstreetmap/josm/command/ChangePropertyCommand.java:75
-#, java-format
-msgid "{0} objects"
-msgstr ""
-
-#: org/openstreetmap/josm/Main.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
 msgid "Files"
 msgstr "Dateien"
 
-#: org/openstreetmap/josm/Main.java:147
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+#, fuzzy
+msgid "Connection"
+msgstr "Auswählen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
 msgid "Layer"
 msgstr "Ebene"
 
-#: org/openstreetmap/josm/Main.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
 msgid "Help"
 msgstr "Hilfe"
 
-#: org/openstreetmap/josm/Main.java:253
-msgid ""
-"Preferences could not be loaded. Write default preference file to '{0} "
-"preferences'."
-msgstr ""
-
-#: org/openstreetmap/josm/Main.java:263
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+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
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: org/openstreetmap/josm/Main.java:297
-#, java-format
-msgid "Ignoring malformed geometry: {0}"
-msgstr ""
-
-#: org/openstreetmap/josm/Main.java:319
-msgid "Ignoring malformed url: '{0}'"
-msgstr ""
-
-#: org/openstreetmap/josm/Main.java:329
-msgid "Ignoring malformed file url: '{0}'"
-msgstr ""
-
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr ""
+
+#~ msgid "F12"
+#~ msgstr "F12"
+
+#~ msgid "Ctrl-O"
+#~ msgstr "Strg-O"
+
+#~ msgid "Ctrl-Z"
+#~ msgstr "Strg-Z"
+
+#~ msgid "Ctrl-Shift-D"
+#~ msgstr "Strg-Shift-D"
+
+#~ msgid "Ctrl-Shift-U"
+#~ msgstr "Strg-Shift-U"
+
+#~ msgid "Ctrl-Shift-Z"
+#~ msgstr "Strg-Shift-Z"
+
+#, fuzzy
+#~ msgid "Ctrl-Shift-Alt-D"
+#~ msgstr "Strg-Shift-D"
+
+#~ msgid "Ctrl-S"
+#~ msgstr "Strg-S"
+
+#~ msgid "Ctrl-E"
+#~ msgstr "Strg-E"
+
+#, fuzzy
+#~ msgid "{0} segment"
+#~ msgid_plural "{0} segments"
+#~ msgstr[0] "Abschnitt"
+#~ msgstr[1] "Abschnitt"
+
+#~ msgid "{0}Java Open Street Map - Editor"
+#~ msgstr "{0}Java OpenStreetMap - Editor "
+
+#, fuzzy
+#~ msgid "Unknown version {0}"
+#~ msgstr "Dateiendung unbekannt."
+
+#, fuzzy
+#~ msgid "upload to: {0}"
+#~ msgstr "Zum OSM speichern"
+
+#, fuzzy
+#~ msgid "Delete "
+#~ msgstr "Löschen"
+
+#~ msgid "Do you want to open {0} as raw gps data?"
+#~ msgstr "Soll {0} als GPS-Daten geöffnet werden?"
+
+#~ msgid "Open as raw data?"
+#~ msgstr "Als Roh-Daten öffnen?"
+
+#, fuzzy
+#~ msgid "An error occoured: "
+#~ msgstr ""
+#~ "Beim speichern ist ein Fehler aufgetreten.\n"
+#~ "{0}"
Index: /po/keys.pot
===================================================================
--- /po/keys.pot	(revision 113)
+++ /po/keys.pot	(revision 113)
@@ -0,0 +1,1702 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-17 02:43+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
+msgid "Add segment"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+msgid "Add a segment between two nodes."
+msgstr ""
+
+#: /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/command/DeleteCommand.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+msgid "Delete"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
+msgid "Delete nodes, streets or segments."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+msgid "Cannot delete node."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
+msgid "This object is in use."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
+msgid "Used by more than two segments."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
+msgid "Used by only one segment."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
+msgid "Used in a way."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
+msgid "Delete Node"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Select objects by dragging or clicking."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Straight line"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Select objects in a straight line."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+msgid "Move selected objects around."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
+msgid "Cannot move objects outside of the world."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add Way"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add a new way to the data."
+msgstr ""
+
+#: /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 ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+msgid "Add segments from ways"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+msgid "Add segments to way?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder all line segments?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder?"
+msgstr ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+msgid "Create new way"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add node"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add a new node to the map"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add node into segment"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add a node into an existing segment"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+msgid "Can not add a node outside of the world."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+msgid "Add Node into 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
+msgid "Preferences"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+msgid "Open a preferences page for global settings."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open a file."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Error while parsing {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+msgid "Downloading data"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
+msgid "Downloading GPS data"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
+msgid "Open as raw gps data"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download from OSM"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download map data from the OSM server."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
+msgid "Bounding box"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
+msgid "min lat"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
+msgid "min lon"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
+msgid "max lat"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
+msgid "max lon"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
+msgid "URL from www.openstreetmap.org"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
+msgid "Bookmarks"
+msgstr ""
+
+#: /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/command/AddCommand.java:52
+msgid "Add"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
+msgid "Please enter the desired coordinates first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
+msgid "Please enter a name for the location."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
+msgid "Remove"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
+msgid "Select a bookmark first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
+msgid "Choose an area"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
+msgid "Please enter the desired coordinates or click on a bookmark."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit the application."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+msgid "About"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+msgid "Display the about screen."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
+#, java-format
+msgid "last change at {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Homepage"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+msgid "Bug Reports"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /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
+msgid "Readme"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+msgid "Revision"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
+msgid "About JOSM..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+msgid "File could not be found."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "File exists. Overwrite?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "Overwrite"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+msgid "selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+msgid "layer"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "conflict"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload to OSM"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload all changes to the OSM server."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
+msgid "Nothing to upload. Get some data first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Uploading data"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgid "No changes to upload."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
+msgid "Objects to add:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
+msgid "Objects to modify:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
+msgid "Objects to delete:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
+msgid "Upload this changes?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download incomplete objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+msgid "Download?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Show background"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Download and show landsat background images."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+msgid "Not implemented yet."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save the current data."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
+msgid "No document open so nothing to save."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "The document contains no data. Save anyway?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "Empty document"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
+msgid "Conflicts"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
+msgid "CSV output not supported yet."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
+msgid "Unknown file extension."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
+msgid "An error occoured while saving."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export to GPX"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export the data to GPX file."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+msgid "gps track description"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
+msgid "Add author information"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
+msgid "Real name"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+msgid "Email"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+msgid "Copyright (URL)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+msgid "Predefined"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
+msgid "Copyright year"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
+msgid "Keywords"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+msgid "Export options"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#, java-format
+msgid "Error while exporting {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+msgid "Error"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
+msgid "Choose a predefined license"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Do nothing"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Report Bug"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
+msgid "Unexpected Exception"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+msgid ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+msgid "Ctrl-"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Alt-"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "AltGr-"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "Shift-"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65
+msgid "Load Selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#, java-format
+msgid "Contact {0}..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+msgid "Downloading..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#, java-format
+msgid "Could not read from url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:92
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+msgid "Current Selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+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/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/ConflictDialog.java:73
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
+msgid "Reload"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Refresh the selection list."
+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 "
+"'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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+msgid "replace selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
+msgid "add to selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+msgid "remove from selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+msgid "Please select something from the conflict list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+msgid "Resolve Conflicts"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+msgid "Command Stack"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+msgid "Open a list of all commands (undo buffer)."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
+msgid "Delete the selected layer."
+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
+msgid "Layers"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+msgid "Open a list of all loaded layers."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
+msgid "Move the selected layer one row up."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
+msgid "Move the selected layer one row down."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
+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
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+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: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
+msgid "Properties"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+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/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/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
+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
+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
+msgid "Delete the selected key in all objects"
+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/command/MoveCommand.java:117
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /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
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /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
+msgid "way"
+msgid_plural "ways"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+msgid "There were conflicts during import."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
+#, java-format
+msgid "{0} consists of:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
+#, java-format
+msgid " ({0} deleted.)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+msgid "Convert to data layer"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:133
+msgid "point"
+msgid_plural "points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#, java-format
+msgid "{0} consists of {1} track"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:163
+msgid "Customize Color"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+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/PleaseWaitRunnable.java:55
+msgid "Cancel"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+msgid "Default"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+msgid "Choose a color"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
+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
+msgid "JPEG images (*.jpg)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
+msgid "Images"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
+msgid "Read GPS..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
+msgid "Time loop in gps data."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+msgid "Geotagged Images"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+msgid "timezone difference: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+msgid "image"
+msgid_plural "images"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+msgid "Sync clock"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#, 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
+#, 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
+msgid "Image"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+msgid "GPS unit timezome (difference to photo)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+msgid "Syncronize Time with GPS Unit"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
+#, java-format
+msgid "WMS layer: {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+msgid "Could not read bookmarks."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+msgid "Could not write bookmark."
+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
+msgid "Java Open Street Map - Editor"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:199
+msgid "layer not in list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:51
+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
+msgid "There are unsaved changes. Really quit?"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
+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"
+"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}"
+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 ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+msgid "my version:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+msgid "their version:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+msgid "resolved version:"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+msgid "Contacting the OSM server..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+msgid "Error while parsing"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+msgid "File Not found"
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+msgid "Name of the user."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+msgid "OSM Password."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "any"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
+msgid "OptionPane.okButtonText"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:89
+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
+msgid "OptionPane.cancelButtonText"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:154
+msgid "Draw lines between raw gps points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:158
+msgid "Force lines if no segments imported."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+msgid "Draw Direction Arrows"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:219
+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
+msgid "Draw direction hints for all segments."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+msgid "Color"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:238
+msgid "Name"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
+msgid "Choose"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+msgid "Please select a color."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:268
+#, java-format
+msgid "Choose a color for {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+msgid "The base URL to the OSM server (REST API)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:276
+msgid "Login name (email) to the OSM account."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
+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
+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
+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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:286
+msgid ""
+"If your gps device draw to few lines, select this to draw lines along your "
+"way."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
+msgid "Colors used by different objects in JOSM."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+msgid "Display Settings"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:293
+msgid "Look and Feel"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:299
+msgid "Colors"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+msgid "Connection Settings"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+msgid "Connection Settings to the OSM server."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
+msgid "Base Server URL"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
+msgid "OSM username (email)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+msgid "OSM password"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
+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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:322
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+msgid "Map Settings"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+msgid "Settings for the map projection and data interpretation."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+msgid "Projection method"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+msgid "Conflicts in disjunct objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#, java-format
+msgid "Downloading {0} {1}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
+msgid "Got more than one object when expecting only one."
+msgstr ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+msgid "Unknown host"
+msgstr ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr ""
+
+#: /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 ""
+
+#: /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 ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+msgid "Maybe add an format string in preferences."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
+msgid "Downloading OSM data..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
+msgid "Incorrect password or username."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
+msgid "Warning: The password is transferred unencrypted."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+msgid "Save user and password (unencrypted)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
+msgid "Enter Password"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
+msgid "Aborting..."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr ""
+
+#: /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] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+msgid "background"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+msgid "incomplete way"
+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/command/ConflictResolveCommand.java:77
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+msgid "object"
+msgid_plural "objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
+msgid "Files"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+msgid "Connection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
+msgid "Layer"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
+msgid "Help"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+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
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr ""
Index: /src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 113)
@@ -2,4 +2,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.xnap.commons.i18n.I18n.marktr;
 
 import java.awt.event.ActionEvent;
@@ -25,13 +26,18 @@
 public class AutoScaleAction extends GroupAction {
 
-	private enum AutoScaleMode {data, selection, layer, conflict}
-	private AutoScaleMode mode = AutoScaleMode.data;
+	private static final String[] modes = {
+		marktr("data"), 
+		marktr("selection"),
+		marktr("layer"),
+		marktr("conflict")
+	};
+	private String mode = "data";
 	private final MapFrame mapFrame;
 
 	private class Action extends AbstractAction {
-		private final AutoScaleMode mode;
-		public Action(AutoScaleMode mode) {
-			super(tr("Auto Scale"+": "+tr(mode.toString())), ImageProvider.get("dialogs/autoscale/"+mode));
-			putValue(SHORT_DESCRIPTION, tr("Auto zoom the view")+tr("(to "+mode+")")+tr(". Disabled if the view is moved."));
+		private final String mode;
+		public Action(String mode) {
+			super(tr("Auto Scale: {0}", tr(mode)), ImageProvider.get("dialogs/autoscale/"+mode));
+			putValue(SHORT_DESCRIPTION, tr("Auto zoom the view (to {0}. Disabled if the view is moved)", tr(mode)));
 			this.mode = mode;
 		}
@@ -48,5 +54,5 @@
 	public AutoScaleAction(final MapFrame mapFrame) {
 		super(KeyEvent.VK_A, 0);
-		for (AutoScaleMode mode : AutoScaleMode.values())
+		for (String mode : modes)
 			actions.add(new Action(mode));
 		setCurrent(0);
@@ -54,5 +60,5 @@
 		Main.ds.addSelectionChangedListener(new SelectionChangedListener(){
 			public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-				if (mode == AutoScaleMode.selection)
+				if (mode.equals("selection"))
 					mapFrame.mapView.recalculateCenterScale();
 			}
@@ -62,15 +68,11 @@
 	public BoundingXYVisitor getBoundingBox() {
 		BoundingXYVisitor v = new BoundingXYVisitor();
-		switch (mode) {
-		case data:
+		if (mode.equals("data")) {
 			for (Layer l : mapFrame.mapView.getAllLayers())
 				l.visitBoundingBox(v);
-			break;
-		case layer:
+		} else if (mode.equals("layer"))
 			mapFrame.mapView.getActiveLayer().visitBoundingBox(v);
-			break;
-		case selection:
-		case conflict:
-			Collection<OsmPrimitive> sel = mode == AutoScaleMode.selection ? Main.ds.getSelected() : mapFrame.conflictDialog.conflicts.keySet();
+		else if (mode.equals("selection") || mode.equals("conflict")) { 
+			Collection<OsmPrimitive> sel = mode.equals("selection") ? Main.ds.getSelected() : mapFrame.conflictDialog.conflicts.keySet();
 			for (OsmPrimitive osm : sel)
 				osm.visit(v);
@@ -81,5 +83,4 @@
 				v.max = new EastNorth(v.max.east()+en.east(), v.max.north()+en.north());
 			}
-			break;
 		}
 		return v;
Index: /src/org/openstreetmap/josm/actions/DiskAccessAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/DiskAccessAction.java	(revision 113)
@@ -7,5 +7,4 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -17,6 +16,6 @@
 abstract public class DiskAccessAction extends JosmAction {
 
-	public DiskAccessAction(String name, String iconName, String tooltip, String shortCutName, KeyStroke shortCut) {
-		super(name, iconName, tooltip, shortCutName, shortCut);
+	public DiskAccessAction(String name, String iconName, String tooltip, int shortCut, int modifiers) {
+		super(name, iconName, tooltip, shortCut, modifiers);
 	}
 	
Index: /src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 113)
@@ -27,5 +27,4 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
@@ -127,6 +126,5 @@
 
 	public DownloadAction() {
-		super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), tr("Ctrl-Shift-D"), 
-				KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+		super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK);
 		// TODO remove when bug in Java6 is fixed
 		for (JTextField f : latlon)
Index: /src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java	(revision 113)
@@ -13,5 +13,4 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -84,6 +83,5 @@
 
 	public DownloadIncompleteAction() {
-		super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), tr("Ctrl-Shift-Alt-D"), 
-				KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK));
+		super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK);
 	}
 
Index: /src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 113)
@@ -24,5 +24,4 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 
@@ -38,10 +37,10 @@
 public class GpxExportAction extends DiskAccessAction {
 
-	private final static String warningGpl = tr("<html><font color='red' size='-2'>Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks</html>");
+	private final static String warningGpl = "<html><font color='red' size='-2'>"+tr("Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks.")+"</html>";
 
 	private final Layer layer;
 
 	public GpxExportAction(Layer layer) {
-		super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), tr("Ctrl-E"), KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK));
+		super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK);
 		this.layer = layer;
 	}
Index: /src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/JosmAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/JosmAction.java	(revision 113)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ShortCutLabel;
 
 /**
@@ -30,10 +31,10 @@
 
 
-	public JosmAction(String name, String iconName, String tooltip, String shortCutName, KeyStroke shortCut) {
+	public JosmAction(String name, String iconName, String tooltip, int shortCut, int modifier) {
 		super(name, ImageProvider.get(iconName));
-		putValue(SHORT_DESCRIPTION, "<html>"+tooltip+" <font size='-2'>"+shortCutName+"</font>&nbsp;</html>");
+		putValue(SHORT_DESCRIPTION, "<html>"+tooltip+" <font size='-2'>"+ShortCutLabel.name(shortCut, modifier)+"</font>&nbsp;</html>");
 		//Main.panel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortCut, name);
         //Main.panel.getActionMap().put(name, this);
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortCut, name);
+        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, modifier), name);
         Main.contentPane.getActionMap().put(name, this);
 	}
Index: /src/org/openstreetmap/josm/actions/OpenAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/OpenAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/OpenAction.java	(revision 113)
@@ -15,5 +15,4 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -39,5 +38,5 @@
 	 */
 	public OpenAction() {
-		super(tr("Open"), "open", tr("Open a file."), tr("Ctrl-O"), KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
+		super(tr("Open"), "open", tr("Open a file."), KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK);
 	}
 
Index: /src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 113)
@@ -5,6 +5,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.gui.PreferenceDialog;
@@ -21,5 +19,5 @@
 	 */
 	public PreferencesAction() {
-		super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), tr("F12"), KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0));
+		super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), KeyEvent.VK_F12, 0);
 	}
 
Index: /src/org/openstreetmap/josm/actions/RedoAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/RedoAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/RedoAction.java	(revision 113)
@@ -6,6 +6,4 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -23,5 +21,5 @@
 	 */
 	public RedoAction() {
-		super(tr("Redo"), "redo", tr("Redo the last undone action."), tr("Ctrl-Shift-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+		super(tr("Redo"), "redo", tr("Redo the last undone action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK);
 		setEnabled(false);
 	}
Index: /src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/SaveAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/SaveAction.java	(revision 113)
@@ -12,5 +12,4 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
 import javax.swing.filechooser.FileFilter;
 
@@ -31,5 +30,5 @@
 	 */
 	public SaveAction() {
-		super(tr("Save"), "save", tr("Save the current data."), tr("Ctrl-S"), KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK));
+		super(tr("Save"), "save", tr("Save the current data."), KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK);
 	}
 	
Index: /src/org/openstreetmap/josm/actions/UndoAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/UndoAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/UndoAction.java	(revision 113)
@@ -6,6 +6,4 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -23,5 +21,5 @@
 	 */
 	public UndoAction() {
-		super(tr("Undo"), "undo", tr("Undo the last action."), tr("Ctrl-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK));
+		super(tr("Undo"), "undo", tr("Undo the last action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK);
 		setEnabled(false);
 	}
Index: /src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/UploadAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/UploadAction.java	(revision 113)
@@ -15,5 +15,4 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -35,6 +34,5 @@
 public class UploadAction extends JosmAction {
 	public UploadAction() {
-		super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), tr("Ctrl-Shift-U"), 
-				KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+		super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK);
 	}
 
Index: /src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java	(revision 113)
@@ -52,5 +52,4 @@
 				"addsegment", 
 				tr("Add a segment between two nodes."), 
-				"G", 
 				KeyEvent.VK_G, 
 				mapFrame, 
Index: /src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java	(revision 113)
@@ -59,5 +59,5 @@
 	 */
 	public AddWayAction(MapFrame mapFrame) {
-		super(tr("Add Way"), "addway", tr("Add a new way to the data."), "W", KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way"));
+		super(tr("Add Way"), "addway", tr("Add a new way to the data."), KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way"));
 		
 		Main.ds.addSelectionChangedListener(this);
Index: /src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 113)
@@ -56,5 +56,4 @@
 				"delete", 
 				tr("Delete nodes, streets or segments."), 
-				"D", 
 				KeyEvent.VK_D, 
 				mapFrame, 
Index: /src/org/openstreetmap/josm/actions/mapmode/MapMode.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 113)
@@ -6,6 +6,4 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -29,6 +27,6 @@
 	 * Constructor for mapmodes without an menu
 	 */
-	public MapMode(String name, String iconName, String tooltip, String keyname, int keystroke, MapFrame mapFrame, Cursor cursor) {
-		super(name, "mapmode/"+iconName, tooltip, keyname, KeyStroke.getKeyStroke(keystroke, 0));
+	public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) {
+		super(name, "mapmode/"+iconName, tooltip, keystroke, 0);
 //		this.cursor = cursor;
 		putValue("active", false);
Index: /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/MoveAction.java	(revision 113)
@@ -52,5 +52,4 @@
 				"move", 
 				tr("Move selected objects around."), 
-				"M", 
 				KeyEvent.VK_M, 
 				mapFrame, 
Index: /src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java	(revision 112)
+++ /src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java	(revision 113)
@@ -44,5 +44,5 @@
 	 */
 	public ZoomAction(MapFrame mapFrame) {
-		super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"), "Z", KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom"));
+		super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"), KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom"));
 		mv = mapFrame.mapView;
 		selectionManager = new SelectionManager(this, true, mv);
Index: /src/org/openstreetmap/josm/command/AddCommand.java
===================================================================
--- /src/org/openstreetmap/josm/command/AddCommand.java	(revision 112)
+++ /src/org/openstreetmap/josm/command/AddCommand.java	(revision 113)
@@ -50,5 +50,5 @@
 		NameVisitor v = new NameVisitor();
 		osm.visit(v);
-		return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL));
+		return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
     }
 }
Index: /src/org/openstreetmap/josm/command/ChangeCommand.java
===================================================================
--- /src/org/openstreetmap/josm/command/ChangeCommand.java	(revision 112)
+++ /src/org/openstreetmap/josm/command/ChangeCommand.java	(revision 113)
@@ -35,5 +35,5 @@
 		NameVisitor v = new NameVisitor();
 		osm.visit(v);
-		return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+v.className+" "+v.name, v.icon, JLabel.HORIZONTAL));
+		return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
     }
 }
Index: /src/org/openstreetmap/josm/command/ChangePropertyCommand.java
===================================================================
--- /src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 112)
+++ /src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 113)
@@ -68,7 +68,7 @@
 			NameVisitor v = new NameVisitor();
 			objects.iterator().next().visit(v);
-			text += " "+v.className+" "+v.name;
+			text += " "+tr(v.className)+" "+v.name;
 		} else
-			text += objects.size()+trn("object","objects",objects.size());
+			text += objects.size()+" "+trn("object","objects",objects.size());
 		DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL));
 		if (objects.size() == 1)
Index: /src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- /src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 112)
+++ /src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 113)
@@ -44,5 +44,5 @@
 		if (data.size() == 1) {
 			data.iterator().next().visit(v);
-			return new DefaultMutableTreeNode(new JLabel(tr("Delete"+" "+v.className+" "+v.name), v.icon, JLabel.HORIZONTAL));
+			return new DefaultMutableTreeNode(new JLabel(tr("Delete")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
 		}
 
@@ -53,5 +53,5 @@
 				cname = v.className;
 			else if (!cname.equals(v.className))
-				cname = "primitive";
+				cname = "object";
 		}
 		DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(
Index: /src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /src/org/openstreetmap/josm/data/Preferences.java	(revision 112)
+++ /src/org/openstreetmap/josm/data/Preferences.java	(revision 113)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.data;
+
+import static org.xnap.commons.i18n.I18n.marktr;
 
 import java.awt.Color;
@@ -128,12 +130,12 @@
 		properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4326");
 		properties.put("osm-server.url", "http://www.openstreetmap.org/api");
-		properties.put("color.background", ColorHelper.color2html(Color.black));
-		properties.put("color.node", ColorHelper.color2html(Color.red));
-		properties.put("color.segment", ColorHelper.color2html(SimplePaintVisitor.darkgreen));
-		properties.put("color.way", ColorHelper.color2html(SimplePaintVisitor.darkblue));
-		properties.put("color.incomplete way", ColorHelper.color2html(SimplePaintVisitor.darkerblue));
-		properties.put("color.selected", ColorHelper.color2html(Color.white));
-		properties.put("color.gps point", ColorHelper.color2html(Color.gray));
-		properties.put("color.conflict", ColorHelper.color2html(Color.gray));
+		properties.put("color."+marktr("background"), ColorHelper.color2html(Color.black));
+		properties.put("color."+marktr("node"), ColorHelper.color2html(Color.red));
+		properties.put("color."+marktr("segment"), ColorHelper.color2html(SimplePaintVisitor.darkgreen));
+		properties.put("color."+marktr("way"), ColorHelper.color2html(SimplePaintVisitor.darkblue));
+		properties.put("color."+marktr("incomplete way"), ColorHelper.color2html(SimplePaintVisitor.darkerblue));
+		properties.put("color."+marktr("selected"), ColorHelper.color2html(Color.white));
+		properties.put("color."+marktr("gps point"), ColorHelper.color2html(Color.gray));
+		properties.put("color."+marktr("conflict"), ColorHelper.color2html(Color.gray));
 		save();
 	}
Index: /src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java
===================================================================
--- /src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 112)
+++ /src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 113)
@@ -46,9 +46,10 @@
 		if (name == null) {
 			if (ls.incomplete)
-				name = ls.id == 0 ? tr("new") : tr("{0} (unknown)", ls.id);
+				name = ls.id == 0 ? tr("new") : ls.id+" ("+tr("unknown")+")";
 			else
 				name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")";
 		}
 		icon = ImageProvider.get("data", "segment");
+		trn("segment", "segments", 0); // no marktrn available
 		className = "segment";
 	}
@@ -63,4 +64,5 @@
 			name = (n.id==0?"":""+n.id)+" ("+n.coor.lat()+","+n.coor.lon()+")";
 		icon = ImageProvider.get("data", "node");
+		trn("node", "nodes", 0); // no marktrn available
 		className = "node";
 	}
@@ -88,4 +90,5 @@
 		}
 		icon = ImageProvider.get("data", "way");
+		trn("way", "ways", 0); // no marktrn available
 		className = "way";
 	}
Index: /src/org/openstreetmap/josm/gui/ConflictResolver.java
===================================================================
--- /src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 113)
@@ -161,5 +161,5 @@
 		
 		if (this.conflicts.isEmpty())
-			throw new RuntimeException(tr("No conflicts but in conflict list:\n{0}" , Arrays.toString(conflicts.entrySet().toArray())));
+			throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
 
 		// have to initialize the JTables here and not in the declaration, because its constructor
Index: /src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MainApplication.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/MainApplication.java	(revision 113)
@@ -49,5 +49,5 @@
 					}
 					if (modified) {
-						final String msg = uploadedModified ? tr("\nHint: Some changes came from uploading new data to the server.") : "";
+						final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
 						final int answer = JOptionPane.showConfirmDialog(
 								Main.parent, tr("There are unsaved changes. Really quit?")+msg,
Index: /src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapStatus.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/MapStatus.java	(revision 113)
@@ -219,7 +219,7 @@
 		setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
 		setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-		add(new JLabel(tr("Lat/Lon ")));
+		add(new JLabel(tr("Lat/Lon")+" "));
 		add(positionText);
-		add(new JLabel(tr(" Object ")));
+		add(new JLabel(" "+tr("Object")+" "));
 		add(nameText);
 
Index: /src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapView.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/MapView.java	(revision 113)
@@ -157,5 +157,5 @@
 			dataLayer.listenerModified.add(new ModifiedChangedListener(){
 				public void modifiedChanged(boolean value, OsmDataLayer source) {
-					JOptionPane.getFrameForComponent(Main.parent).setTitle(tr("{0}Java Open Street Map - Editor",(value?"*":"")));
+					JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java Open Street Map - Editor"));
 				}
 			});
@@ -326,5 +326,5 @@
 	public void setActiveLayer(Layer layer) {
 		if (!layers.contains(layer))
-			throw new IllegalArgumentException(tr("layer must be in layerlist"));
+			throw new IllegalArgumentException("Layer must be in layerlist");
 		Layer old = activeLayer;
 		activeLayer = layer;
Index: /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 113)
@@ -53,5 +53,5 @@
 		pane.add(currentAction, GBC.eol().fill(GBC.HORIZONTAL));
 		pane.add(progressBar, GBC.eop().fill(GBC.HORIZONTAL));
-		JButton cancel = new JButton(tr(tr("Cancel")));
+		JButton cancel = new JButton(tr("Cancel"));
 		pane.add(cancel, GBC.eol().anchor(GBC.CENTER));
 		pleaseWaitDlg.setContentPane(pane);
@@ -79,8 +79,8 @@
 		} catch (SAXException x) {
 			x.printStackTrace();
-			errorMessage = tr("Error while parsing: ")+x.getMessage();
+			errorMessage = tr("Error while parsing")+": "+x.getMessage();
 		} catch (FileNotFoundException x) {
 			x.printStackTrace();
-			errorMessage = tr("Not found: ") + x.getMessage();
+			errorMessage = tr("File Not found")+": "+x.getMessage();
 		} catch (IOException x) {
 			x.printStackTrace();
Index: /src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 113)
@@ -230,11 +230,11 @@
 		for (Entry<String,String> e : allColors.entrySet()) {
 			Vector<Object> row = new Vector<Object>(2);
-			row.add(e.getKey().substring("color.".length()));
+			row.add(tr(e.getKey().substring("color.".length())));
 			row.add(ColorHelper.html2color(e.getValue()));
 			rows.add(row);
 		}
 		Vector<Object> cols = new Vector<Object>(2);
-		cols.add("Color");
-		cols.add("Name");
+		cols.add(tr("Color"));
+		cols.add(tr("Name"));
 		colors = new JTable(rows, cols){
 			@Override public boolean isCellEditable(int row, int column) {
Index: /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 113)
@@ -3,4 +3,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
+import static org.xnap.commons.i18n.I18n.marktr;
 
 import java.awt.BorderLayout;
@@ -86,5 +87,5 @@
 		String key = data.getValueAt(row, 0).toString();
 		Collection<OsmPrimitive> sel = Main.ds.getSelected();
-		String msg = "<html>"+trn("This will change {0} object.", "This will change {0} objects.", sel.size(), sel.size())+"<br><br> "+tr("Please select a new value for \"{0}\".<br>(Empty string deletes the key.)</html>)", key);
+		String msg = "<html>"+trn("This will change {0} object.", "This will change {0} objects.", sel.size(), sel.size())+"<br><br> "+tr("Please select a new value for \"{0}\".<br>(Empty string deletes the key.)", key)+"</html>";
 		final JComboBox combo = (JComboBox)data.getValueAt(row, 1);
 		JPanel p = new JPanel(new BorderLayout());
@@ -136,7 +137,5 @@
 
 		JPanel p = new JPanel(new BorderLayout());
-		p.add(new JLabel(trn("<html>This will change {0} object.<br><br>Please select a key",
-				"<html>This will change {0} objects.<br><br>Please select a key",
-				sel.size(),sel.size())),
+		p.add(new JLabel("<html>"+trn("This will change {0} object.","This will change {0} objects.", sel.size(),sel.size())+"<br><br>"+tr("Please select a key")),
 				BorderLayout.NORTH);
 		TreeSet<String> allKeys = new TreeSet<String>();
@@ -250,12 +249,12 @@
 			}
 		};
-		buttonPanel.add(createButton(tr("Add"),tr("Add a new key/value pair to all objects"), KeyEvent.VK_A, buttonAction));
-		buttonPanel.add(createButton(tr("Edit"),tr( "Edit the value of the selected key for all objects"), KeyEvent.VK_E, buttonAction));
-		buttonPanel.add(createButton(tr("Delete"),tr("Delete the selected key in all objects"), KeyEvent.VK_D, buttonAction));
+		buttonPanel.add(createButton(marktr("Add"),tr("Add a new key/value pair to all objects"), KeyEvent.VK_A, buttonAction));
+		buttonPanel.add(createButton(marktr("Edit"),tr( "Edit the value of the selected key for all objects"), KeyEvent.VK_E, buttonAction));
+		buttonPanel.add(createButton(marktr("Delete"),tr("Delete the selected key in all objects"), KeyEvent.VK_D, buttonAction));
 		add(buttonPanel, BorderLayout.SOUTH);
 	}
 
 	private JButton createButton(String name, String tooltip, int mnemonic, ActionListener actionListener) {
-		JButton b = new JButton(name, ImageProvider.get("dialogs", name.toLowerCase()));
+		JButton b = new JButton(tr(name), ImageProvider.get("dialogs", name.toLowerCase()));
 		b.setActionCommand(name);
 		b.addActionListener(actionListener);
Index: /src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 113)
@@ -9,9 +9,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.tools.ShortCutLabel;
 
 /**
@@ -27,6 +25,6 @@
 	    public AbstractButton button;
 
-	    private ToggleDialogAction(String name, String iconName, String tooltip, String shortcut, KeyStroke cut, String prefname) {
-		    super(name, iconName, tooltip, shortcut, cut);
+	    private ToggleDialogAction(String name, String iconName, String tooltip, int shortCut, int modifier, String prefname) {
+		    super(name, iconName, tooltip, shortCut, modifier);
 		    this.prefname = prefname;
 	    }
@@ -48,5 +46,5 @@
 	public ToggleDialog(String name, String iconName, String tooltip, int shortCut) {
 		this.prefName = iconName;
-		action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, ShortCutLabel.name(shortCut, KeyEvent.ALT_MASK), KeyStroke.getKeyStroke(shortCut, KeyEvent.ALT_MASK), iconName);
+		action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortCut, KeyEvent.ALT_MASK, iconName);
 		setLayout(new BorderLayout());
 		add(new JLabel(name), BorderLayout.NORTH);
Index: /src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 113)
@@ -94,5 +94,5 @@
 				for (GpsPoint p : c) {
 					if (p.time == null)
-						throw new IOException(tr("No time for point {0},{1}",p.latlon.lat(),p.latlon.lon()));
+						throw new IOException(tr("No time for point {0} x {1}",p.latlon.lat(),p.latlon.lon()));
 					Date d = null;
                     try {
@@ -279,5 +279,5 @@
 			if (e.pos != null)
 				i++;
-		return trn("{0} image. {1} within the track.","{0} images. {1} within the track.",data.size(),data.size(),i);
+		return data.size()+" "+trn("image","images",data.size())+". "+tr("{0} within the track.",i);
 	}
 
Index: /src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 113)
@@ -151,7 +151,7 @@
 
 	@Override public String getToolTipText() {
-		return trn("{0} node", "{0} nodes", undeletedSize(data.nodes), undeletedSize(data.nodes))
-		+trn("{0} segment", "{0} segments", undeletedSize(data.segments), undeletedSize(data.segments))
-		+trn("{0} way", "{0} ways", undeletedSize(data.ways), undeletedSize(data.ways));
+		return undeletedSize(data.nodes)+" "+trn("node", "nodes", undeletedSize(data.nodes))+
+		undeletedSize(data.segments)+" "+trn("segment", "segments", undeletedSize(data.segments))+
+		undeletedSize(data.ways)+" "+trn("way", "ways", undeletedSize(data.ways));
 	}
 
Index: /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 112)
+++ /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 113)
@@ -130,6 +130,6 @@
 		for (Collection<GpsPoint> c : data)
 			points += c.size();
-		return trn("{0} track", "{0} tracks", data.size(), data.size())
-		+" "+trn("{0} point", "{0} points", points, points);
+		return data.size()+" "+trn("track", "tracks", data.size())
+		+" "+points+" "+trn("point", "points", points);
 	}
 
@@ -157,5 +157,5 @@
 		}
 		b.append("</html>");
-		return "<html>"+tr("{0} consists of ")+trn("{0} track", "{0} tracks", data.size(), data.size())+" ("+trn("{0} point", "{0} points", points, points)+")<br>"+b.toString();
+		return "<html>"+tr("{0} consists of {1} track", "{0} consists of {1} tracks", data.size(), name, data.size())+" ("+trn("{0} point", "{0} points", points, points)+")<br>"+b.toString();
 	}
 
Index: /src/org/openstreetmap/josm/io/ObjectListDownloader.java
===================================================================
--- /src/org/openstreetmap/josm/io/ObjectListDownloader.java	(revision 112)
+++ /src/org/openstreetmap/josm/io/ObjectListDownloader.java	(revision 113)
@@ -33,5 +33,5 @@
 			for (OsmPrimitive osm : toDownload) {
 				osm.visit(namer);
-				download(namer.className, osm.id);
+				download(tr(namer.className), osm.id);
 				if (cancel)
 					break;
Index: /src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- /src/org/openstreetmap/josm/io/OsmReader.java	(revision 112)
+++ /src/org/openstreetmap/josm/io/OsmReader.java	(revision 113)
@@ -94,7 +94,7 @@
 				if (qName.equals("osm")) {
 					if (atts == null)
-						throw new SAXException(tr("Unknown version."));
+						throw new SAXException(tr("Unknown version"));
 					if (!"0.3".equals(atts.getValue("version")))
-						throw new SAXException(tr("Unknown version {0}",atts.getValue("version")));
+						throw new SAXException(tr("Unknown version")+": "+atts.getValue("version"));
 				} else if (qName.equals("node")) {
 					current = new Node(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon")));
Index: /src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- /src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 112)
+++ /src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 113)
@@ -69,5 +69,5 @@
 					return;
 				osm.visit(v);
-				currentAction.setText(tr("Upload {0} {1} ({2})...", v.className, v.name, osm.id));
+				currentAction.setText(tr("Upload {0} {1} ({2})...", tr(v.className), v.name, osm.id));
 				osm.visit(this);
 				progress.setValue(progress.getValue()+1);
@@ -154,5 +154,5 @@
 		try {
 			URL url = new URL(Main.pref.get("osm-server.url") + "/0.3/" + urlSuffix + "/" + osm.id);
-			System.out.println(tr("upload to: {0}"));
+			System.out.println("upload to: "+url);
 			activeConnection = (HttpURLConnection) url.openConnection();
 			activeConnection.setConnectTimeout(15000);
@@ -171,5 +171,5 @@
 			if (retCode == 200 && osm.id == 0)
 				osm.id = readId(activeConnection.getInputStream());
-			System.out.println(tr("got return: {0} with id {1}",retCode,osm.id));
+			System.out.println("got return: "+retCode+" with id "+osm.id);
 			String retMsg = activeConnection.getResponseMessage();
 			activeConnection.disconnect();
@@ -183,5 +183,5 @@
 			}
 		} catch (UnknownHostException e) {
-			throw new RuntimeException(tr("Unknown host: ")+e.getMessage(), e);
+			throw new RuntimeException(tr("Unknown host")+": "+e.getMessage(), e);
 		} catch (Exception e) {
 			if (cancel)
Index: /src/org/openstreetmap/josm/io/RawCsvReader.java
===================================================================
--- /src/org/openstreetmap/josm/io/RawCsvReader.java	(revision 112)
+++ /src/org/openstreetmap/josm/io/RawCsvReader.java	(revision 113)
@@ -81,5 +81,5 @@
 						st.nextToken();
 					else
-						throw new SAXException(tr("Unknown data type: \"{0}\".{1}",token,(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : "")));
+						throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : ""));
 				}
 				data.add(new GpsPoint(new LatLon(lat, lon), time));
Index: /src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- /src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 112)
+++ /src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 113)
@@ -49,5 +49,5 @@
 
 					URL revUrl = Main.class.getResource("/REVISION");
-					StringBuilder sb = new StringBuilder("Please send this to josm@eigenheimstrasse.de\n\n");
+					StringBuilder sb = new StringBuilder(tr("Please send this to josm@eigenheimstrasse.de\n\n"));
 					if (revUrl == null) {
 						sb.append("Development version. Unknown revision.");
@@ -70,5 +70,5 @@
 
 					JPanel p = new JPanel(new GridBagLayout());
-					p.add(new JLabel("Please send an email with the following information to josm@eigenheimstrasse.de"), GBC.eop());
+					p.add(new JLabel(tr("Please send an email with the following information to josm@eigenheimstrasse.de")), GBC.eop());
 
 					JTextArea info = new JTextArea(sb.toString(), 20, 60);
Index: /src/org/openstreetmap/josm/tools/DateParser.java
===================================================================
--- /src/org/openstreetmap/josm/tools/DateParser.java	(revision 112)
+++ /src/org/openstreetmap/josm/tools/DateParser.java	(revision 113)
@@ -1,5 +1,3 @@
 package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.ParseException;
@@ -42,5 +40,5 @@
 			try {return sdf.parse(d);} catch (ParseException pe) {}
 		}
-		throw new ParseException(tr("No applicable parse format"), 0);
+		throw new ParseException("", 0);
 	}
 }
Index: /src/org/openstreetmap/josm/tools/ShortCutLabel.java
===================================================================
--- /src/org/openstreetmap/josm/tools/ShortCutLabel.java	(revision 112)
+++ /src/org/openstreetmap/josm/tools/ShortCutLabel.java	(revision 113)
@@ -17,5 +17,8 @@
 		if ((modifiers & KeyEvent.SHIFT_MASK) != 0)
 			s += tr("Shift-");
-		s += Character.toUpperCase((char)shortCut);
+		if (shortCut >= KeyEvent.VK_F1 && shortCut <= KeyEvent.VK_F12)
+			s += "F"+(shortCut-KeyEvent.VK_F1+1);
+		else
+			s += Character.toUpperCase((char)shortCut);
 		return s;
 	}
