Index: /build.xml
===================================================================
--- /build.xml	(revision 122)
+++ /build.xml	(revision 123)
@@ -80,4 +80,7 @@
     		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lfr ${po}/fr.po"/>
     	</exec>
+    	<exec executable="msgfmt">
+    		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -len_GB ${po}/en_GB.po"/>
+    	</exec>
     </target>
 
Index: /po/en_GB.po
===================================================================
--- /po/en_GB.po	(revision 123)
+++ /po/en_GB.po	(revision 123)
@@ -0,0 +1,1947 @@
+# British English translation of JOSM.
+# Copyright (C) 2006 JOSM'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the JOSM package.
+# Bruce Cowan <bruce.cowan@dsl.pipex.com>, 2006.
+# , fuzzy
+# Bruce Cowan <bruce.cowan@dsl.pipex.com>, 2006.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: JOSM SVN\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-23 18:02+0200\n"
+"PO-Revision-Date: 2006-07-22 16:18+0100\n"
+"Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
+"Language-Team: English/GB <josm-en_gb@eigenheimstrasse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\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 "Add segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+msgid "Add a segment between two nodes."
+msgstr "Add a segment between two nodes."
+
+#: /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:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
+#: /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 "Delete"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
+msgid "Delete nodes, streets or segments."
+msgstr "Delete nodes, streets or segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+msgid "Cannot delete node."
+msgstr "Cannot delete node."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
+msgid "This object is in use."
+msgstr "This object is in use."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
+msgid "Used by more than two segments."
+msgstr "Used by more than two segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
+msgid "Used by only one segment."
+msgstr "Used by only one segment."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
+msgid "Used in a way."
+msgstr "Used in a way."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Wrong direction of segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Conflicting keys"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
+msgid "Delete Node"
+msgstr "Delete Node"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom"
+msgstr "Zoom"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+msgstr "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Selection"
+msgstr "Selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Select objects by dragging or clicking."
+msgstr "Select objects by dragging or clicking."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Straight line"
+msgstr "Straight line"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Select objects in a straight line."
+msgstr "Select objects in a straight line."
+
+#: /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 "Move"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+msgid "Move selected objects around."
+msgstr "Move selected objects around."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
+msgid "Cannot move objects outside of the world."
+msgstr "Cannot move objects outside of the world."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add Way"
+msgstr "Add Way"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add a new way to the data."
+msgstr "Add a new way to the data."
+
+#: /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 ""
+"Warning: This way is incomplete. Try to download it before adding segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#, fuzzy, java-format
+msgid ""
+"{0} way has been selected.\n"
+"Do you wish to select all segments belonging to the way instead?"
+msgid_plural ""
+"{0} ways have been selected.\n"
+"Do you wish to select all segments belonging to the ways instead?"
+msgstr[0] ""
+"{0} way has been selected.\n"
+"Do you wish to select all segments belonging to the way instead?{0} ways "
+"have been selected.\n"
+"Do you wish to select all segments belonging to the ways instead?"
+msgstr[1] ""
+"{0} way has been selected.\n"
+"Do you wish to select all segments belonging to the way instead?{0} ways "
+"have been selected.\n"
+"Do you wish to select all segments belonging to the ways instead?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+msgid "Add segments from ways"
+msgstr "Add segments from ways"
+
+#: /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 ""
+"Do you want to add all other selected segments to the one selected way?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+msgid "Add segments to way?"
+msgstr "Add segments to way?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder all line segments?"
+msgstr "Reorder all line segments?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder?"
+msgstr "Reorder?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#, fuzzy, java-format
+msgid "Create a new way out of {0} segment?"
+msgid_plural "Create a new way out of {0} segments?"
+msgstr[0] "Create a new way out of {0} segment?"
+msgstr[1] "Create a new way out of {0} segment?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+msgid "Create new way"
+msgstr "Create new way"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add node"
+msgstr "Add node"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add a new node to the map"
+msgstr "Add a new node to the map"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add node into segment"
+msgstr "Add node into segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add a node into an existing segment"
+msgstr "Add a node into an existing segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+msgid "Can not add a node outside of the world."
+msgstr "Can not add a node outside of the world."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+msgid "Add Node into Segment"
+msgstr "Add Node into Segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
+msgid "Preferences"
+msgstr "Preferences"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+msgid "Open a preferences page for global settings."
+msgstr "Open a preferences page for global settings."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open"
+msgstr "Open"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open a file."
+msgstr "Open a file."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
+msgid "CSV Data import for non-GPS data is not implemented yet."
+msgstr "CSV Data import for non-GPS data is not implemented yet."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Unknown file extension: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:79
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:63
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+msgid "Data Layer"
+msgstr "Data Layer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Error while parsing {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Could not read \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo"
+msgstr "Undo"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Undo the last action."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+msgid "Downloading data"
+msgstr "Downloading data"
+
+#: /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 "No data imported."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
+msgid "Downloading GPS data"
+msgstr "Downloading GPS data"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
+msgid "Open as raw gps data"
+msgstr "Open as raw gps data"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download from OSM"
+msgstr "Download from OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download map data from the OSM server."
+msgstr "Download map data from the OSM server."
+
+#: /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 ""
+"Move and zoom the image like the main map. Select an area to download by "
+"dragging."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
+msgid "Bounding box"
+msgstr "Bounding box"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
+msgid "min lat"
+msgstr "min lat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
+msgid "min lon"
+msgstr "min lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
+msgid "max lat"
+msgstr "max lat"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
+msgid "max lon"
+msgstr "max lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
+msgid "URL from www.openstreetmap.org"
+msgstr "URL from www.openstreetmap.org"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
+msgid "Add"
+msgstr "Add"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
+msgid "Please enter the desired coordinates first."
+msgstr "Please enter the desired coordinates first."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
+msgid "Please enter a name for the location."
+msgstr "Please enter a name for the location."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
+msgid "Remove"
+msgstr "Remove"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
+msgid "Select a bookmark first."
+msgstr "Select a bookmark first."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
+msgid "Choose an area"
+msgstr "Choose an area"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
+msgid "Please enter the desired coordinates or click on a bookmark."
+msgstr "Please enter the desired coordinates or click on a bookmark."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit"
+msgstr "Exit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit the application."
+msgstr "Exit the application."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "About"
+msgstr "About"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+msgid "Display the about screen."
+msgstr "Display the about screen."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#, java-format
+msgid "last change at {0}"
+msgstr "last change at {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, fuzzy, java-format
+msgid "Java Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+msgid "Homepage"
+msgstr "Homepage"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
+msgid "Bug Reports"
+msgstr "Bug Reports"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
+msgid "Readme"
+msgstr "Readme"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
+msgid "Revision"
+msgstr "Revision"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#, fuzzy
+msgid "Contribution"
+msgstr "Connection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+msgid "About JOSM..."
+msgstr "About JOSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
+msgid "File could not be found."
+msgstr "File could not be found."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "File exists. Overwrite?"
+msgstr "File exists. Overwrite?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr "data"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+msgid "selection"
+msgstr "selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+msgid "layer"
+msgstr "layer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+msgid "conflict"
+msgstr "conflict"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr "Auto Scale: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
+#, java-format
+msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
+msgstr "Auto zoom the view (to {0}. Disabled if the view is moved)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload to OSM"
+msgstr "Upload to OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload all changes to the OSM server."
+msgstr "Upload all changes to the OSM server."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
+msgid "Nothing to upload. Get some data first."
+msgstr "Nothing to upload. Get some data first."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr "There are unresolved conflicts. You have to resolve these first."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Uploading data"
+msgstr "Uploading data"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgid "No changes to upload."
+msgstr "No changes to upload."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
+msgid "Objects to add:"
+msgstr "Objects to add:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
+msgid "Objects to modify:"
+msgstr "Objects to modify:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
+msgid "Objects to delete:"
+msgstr "Objects to delete:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
+msgid "Upload this changes?"
+msgstr "Upload these changes?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "OSM Server Files (.osm .xml)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "GPX Files (.gpx)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "CSV Files (.csv .txt)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Redo"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Redo the last undone action."
+
+#: /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] "Downloading {0} segments"
+msgstr[1] "Downloading {0} segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download incomplete objects"
+msgstr "Download incomplete objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr "Download all (selected) incomplete ways from the OSM server."
+
+#: /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 "Download {0} ways containing a total of {1} segments?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+msgid "Download?"
+msgstr "Download?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Show background"
+msgstr "Show background"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Download and show landsat background images."
+msgstr "Download and show landsat background images."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+msgid "Not implemented yet."
+msgstr "Not implemented yet."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save"
+msgstr "Save"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save the current data."
+msgstr "Save the current data."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
+msgid "No document open so nothing to save."
+msgstr "No document open so nothing to save."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "The document contains no data. Save anyway?"
+msgstr "The document contains no data. Save anyway?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "Empty document"
+msgstr "Empty document"
+
+#: /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 ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
+msgid "Conflicts"
+msgstr "Conflicts"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
+msgid "CSV output not supported yet."
+msgstr "CSV output not supported yet."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
+msgid "Unknown file extension."
+msgstr "Unknown file extension."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
+msgid "An error occoured while saving."
+msgstr "An error occoured while saving."
+
+#: /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 ""
+"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
+"tracks."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export to GPX"
+msgstr "Export to GPX"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export the data to GPX file."
+msgstr "Export the data to GPX file."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr "Nothing to export. Get some data first."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+msgid "gps track description"
+msgstr "gps track description"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
+msgid "Add author information"
+msgstr "Add author information"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
+msgid "Real name"
+msgstr "Real name"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+msgid "Email"
+msgstr "Email"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+msgid "Copyright (URL)"
+msgstr "Copyright (URL)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+msgid "Predefined"
+msgstr "Predefined"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
+msgid "Copyright year"
+msgstr "Copyright year"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
+msgid "Keywords"
+msgstr "Keywords"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+msgid "Export options"
+msgstr "Export options"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Error while exporting {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+msgid "Error"
+msgstr "Error"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
+msgid "Choose a predefined license"
+msgstr "Choose a predefined license"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Report Bug"
+msgstr "Report Bug"
+
+#: /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 ""
+"An unexpected exception occured.\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."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
+msgid "Unexpected Exception"
+msgstr "Unexpected Exception"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+msgid ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+msgstr ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+msgid ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+msgstr ""
+"Please send an email with the following information to josm@eigenheimstrasse."
+"de"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+msgid "Ctrl-"
+msgstr "Ctrl-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+msgid "Alt-"
+msgstr "Alt-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+msgid "AltGr-"
+msgstr "AltGr-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+msgid "Shift-"
+msgstr "Shift-"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
+msgid "Load Selection"
+msgstr "Load Selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contact {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
+msgid "Downloading..."
+msgstr "Downloading..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
+#, java-format
+msgid "Could not read from url: \"{0}\""
+msgstr "Could not read from url: \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr "Parsing error in url: \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+msgid "Current Selection"
+msgstr "Current Selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+msgid "Open a selection list window."
+msgstr "Open a selection list window."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Select"
+msgstr "Select"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Set the selected elements on the map to the selected items in the list above."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
+msgid "Reload"
+msgstr "Reload"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+msgid "Refresh the selection list."
+msgstr "Refresh the selection list."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
+msgid "Search"
+msgstr "Search"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
+msgid "Search for objects."
+msgstr "Search for objects."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
+msgid "Please enter a search string."
+msgstr "Please enter a search string."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>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>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+msgid "replace selection"
+msgstr "replace selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+msgid "add to selection"
+msgstr "add to selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+msgid "remove from selection"
+msgstr "remove from selection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr "Conflict"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr "Merging conflicts."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Resolve"
+
+#: /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 "Open a merge dialog of all selected items in the list above."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+msgid "Please select something from the conflict list."
+msgstr "Please select something from the conflict list."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+msgid "Resolve Conflicts"
+msgstr "Resolve Conflicts"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Command Stack"
+msgstr "Command Stack"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Open a list of all commands (undo buffer)."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
+msgid "Delete the selected layer."
+msgstr "Delete the selected layer."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+msgid "Show/Hide"
+msgstr "Show/Hide"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
+msgid "Layers"
+msgstr "Layers"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
+msgid "Open a list of all loaded layers."
+msgstr "Open a list of all loaded layers."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
+msgid "Merge the selected layer into the layer directly below."
+msgstr "Merge the selected layer into the layer directly below."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
+#, fuzzy, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "This will change {0} object."
+msgstr[1] "This will change {0} object."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+msgstr ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:107
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+msgid "Change values?"
+msgstr "Change values?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:351
+msgid "<different>"
+msgstr "<different>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
+msgid "Please select a key"
+msgstr "Please select a key"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
+msgid "Please select a value"
+msgstr "Please select a value"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
+msgid "Properties"
+msgstr "Properties"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
+msgid "Property for selected objects."
+msgstr "Properties for selected objects."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
+#, fuzzy, java-format
+msgid "Could not read annotation preset source: {0}"
+msgstr "Could not read from url: \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:231
+#, fuzzy, java-format
+msgid "Error parsing {0}: "
+msgstr "Error while parsing {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
+#, fuzzy, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "This will change {0} object."
+msgstr[1] "This will change {0} object."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Key"
+msgstr "Key"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Value"
+msgstr "Value"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+msgid "Please select the row to edit."
+msgstr "Please select the row to edit."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
+msgid "Add a new key/value pair to all objects"
+msgstr "Add a new key/value pair to all objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:190
+msgid "Edit"
+msgstr "Edit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
+msgid "Edit the value of the selected key for all objects"
+msgstr "Edit the value of the selected key for all objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+msgid "Delete the selected key in all objects"
+msgstr "Delete the selected key in all objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:220
+#, fuzzy
+msgid "Change Properties"
+msgstr "Properties"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "node"
+msgstr[1] "node"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+#, fuzzy
+msgid "segment"
+msgid_plural "segments"
+msgstr[0] "segment"
+msgstr[1] "segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+#, fuzzy
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "way"
+msgstr[1] "way"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+msgid "There were conflicts during import."
+msgstr "There were conflicts during import."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consists of:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} deleted.)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+msgid "Convert to data layer"
+msgstr "Convert to data layer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+#, fuzzy
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "track"
+msgstr[1] "track"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
+#, fuzzy
+msgid "point"
+msgid_plural "points"
+msgstr[0] "point"
+msgstr[1] "point"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#, fuzzy, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "a track with {0} point"
+msgstr[1] "a track with {0} point"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#, java-format
+msgid "{0} consists of {1} track"
+msgstr "{0} consists of {1} track"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#, fuzzy, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} point"
+msgstr[1] "{0} point"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+msgid "OK"
+msgstr "OK"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
+msgid "Cancel"
+msgstr "Cancel"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+msgid "Default"
+msgstr "Default"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Import images"
+msgstr "Import images"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG images (*.jpg)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:83
+msgid "Images"
+msgstr "Images"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:88
+msgid "Read GPS..."
+msgstr "Read GPS..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "No time for point {0} x {1}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Cannot read time \"{0}\" from point {1} x {2}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
+msgid "Time loop in gps data."
+msgstr "Time loop in gps data."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
+msgid "No images with readable timestamps found."
+msgstr "No images with readable timestamps found."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#, java-format
+msgid "Reading {0}..."
+msgstr "Reading {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+msgid "Geotagged Images"
+msgstr "Geotagged Images"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS end: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#, java-format
+msgid "current delta: {0}s"
+msgstr "current delta: {0}s"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+msgid "timezone difference: "
+msgstr "timezone difference: "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, fuzzy
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "image"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} within the track."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+msgid "Sync clock"
+msgstr "Sync clock"
+
+#: /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 "The date in file \"{0}\" could not be parsed."
+
+#: /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 "There is no EXIF time within the file \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+msgid "Image"
+msgstr "Image"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+msgid "GPS unit timezome (difference to photo)"
+msgstr "GPS unit timezome (difference to photo)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+msgid "Syncronize Time with GPS Unit"
+msgstr "Synchronise Time with GPS Unit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+msgid "Time entered could not be parsed."
+msgstr "Time entered could not be parsed."
+
+#: /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 "Wrong longitude transformation for tile cache. Can't operate on {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "WMS layer: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+msgid "Could not read bookmarks."
+msgstr "Could not read bookmarks."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+msgid "Could not write bookmark."
+msgstr "Could not write bookmark."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
+msgid "Java Open Street Map - Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
+msgid "layer not in list."
+msgstr "layer not in list."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr "Hint: Some changes came from uploading new data to the server."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+msgid "There are unsaved changes. Really quit?"
+msgstr "There are unsaved changes. Really quit?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
+msgid "Unsaved Changes"
+msgstr "Unsaved Changes"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#, fuzzy
+msgid "Java OpenStreetMap Editor"
+msgstr "Java Open Street Map - Editor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "usage"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#, fuzzy
+msgid "options"
+msgstr "Export options"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Show this help"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Download the bounding box"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgid "Select with the given search"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
+msgid "Don't launch in fullscreen mode"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
+msgid "Reset the preferences to default"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
+msgid "Set the language. Example: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "examples"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:221
+msgid "Lat/Lon"
+msgstr "Lat/Lon"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Object"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#, fuzzy, java-format
+msgid "{0} object has conflicts:"
+msgid_plural "{0} objects have conflicts:"
+msgstr[0] "{0} object has conflicts:"
+msgstr[1] "{0} object has conflicts:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+msgid "my version:"
+msgstr "my version:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+msgid "their version:"
+msgstr "their version:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+msgid "resolved version:"
+msgstr "resolved version:"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+msgid "Contacting the OSM server..."
+msgstr "Contacting the OSM server..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+msgid "Error while parsing"
+msgstr "Error while parsing"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+msgid "File Not found"
+msgstr "File Not found"
+
+#: /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 "string"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+msgid "Name of the user."
+msgstr "Name of the user."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+msgid "OSM Password."
+msgstr "OSM Password."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
+
+#: /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 "string;string;..."
+
+#: /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 ""
+"Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
+"filename"
+
+#: /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 ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
+"lat=y&lon=x&zoom=z or a filename"
+
+#: /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 ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"url which returns osm-xml"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "any"
+msgstr "any"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "If specified, reset the configuration instead of reading it."
+
+#: /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 "Username"
+
+#: /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 "Password"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
+msgid "OptionPane.okButtonText"
+msgstr "OptionPane.okButtonText"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "You have to restart JOSM for some settings to take effect."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
+msgid "OptionPane.cancelButtonText"
+msgstr "OptionPane.cancelButtonText"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+msgid "Draw lines between raw gps points."
+msgstr "Draw lines between raw gps points."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
+msgid "Force lines if no segments imported."
+msgstr "Force lines if no segments imported."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
+msgid "Draw large GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+msgid "Draw Direction Arrows"
+msgstr "Draw Direction Arrows"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Force drawing of lines if the imported data contain no line information."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+msgid "Draw larger dots for the GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+msgid "Draw direction hints for all segments."
+msgstr "Draw direction hints for all segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
+msgid "Color"
+msgstr "Colour"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+msgid "Name"
+msgstr "Name"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+msgid "Choose"
+msgstr "Choose"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
+msgid "Please select a color."
+msgstr "Please select a colour."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choose a colour for {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
+msgid "Annotation preset source"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
+msgid "The base URL to the OSM server (REST API)"
+msgstr "The base URL to the OSM server (REST API)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+msgid "Login name (email) to the OSM account."
+msgstr "Login name (email) to the OSM account."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Login password to the OSM account. Leave blank to not store any password."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+msgid "The base URL to the server retrieving WMS background pictures from."
+msgstr "The base URL to the server retrieving WMS background pictures from."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+msgid ""
+"<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
+"b>: The latitude coordinate<br><b>lon</b>: The longitude "
+"coordinate<br><b>time</b>: The measured time as string<br><b>ignore</b>: "
+"Skip this field<br>An example: \"ignore ignore lat lon\" will use ' ' as "
+"delimiter, skip the first two values and read then lat/lon.<br>Other "
+"example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
+msgstr ""
+"<html>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>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+msgid ""
+"If your gps device draw to few lines, select this to draw lines along your "
+"way."
+msgstr ""
+"If your gps device draw to few lines, select this to draw lines along your "
+"way."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
+msgid "Colors used by different objects in JOSM."
+msgstr "Colours used by different objects in JOSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
+msgid ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+msgid "Add a new annotation preset source to the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
+#, fuzzy
+msgid "Delete the selected source from the list."
+msgstr "Delete the selected layer."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+msgid "Display Settings"
+msgstr "Display Settings"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Various settings that influence the visual representation of the whole "
+"program."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
+msgid "Look and Feel"
+msgstr "Look and Feel"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+msgid "Language"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
+msgid "Colors"
+msgstr "Colours"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+msgid "Connection Settings to the OSM server."
+msgstr "Connection Settings to the OSM server."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
+msgid "Base Server URL"
+msgstr "Base Server URL"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+msgid "OSM username (email)"
+msgstr "OSM username (email)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+msgid "OSM password"
+msgstr "OSM password"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transfered in plain text to the server, encoded in the "
+"url.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>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>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr "CSV import specification (empty: read from first line in data)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+msgid "Map Settings"
+msgstr "Map Settings"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+msgid "Settings for the map projection and data interpretation."
+msgstr "Settings for the map projection and data interpretation."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+msgid "Projection method"
+msgstr "Projection method"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
+msgid "Annotation preset sources"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+msgid "Conflicts in disjunct objects"
+msgstr "Conflicts in disjunct objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#, java-format
+msgid "Downloading {0} {1}"
+msgstr "Downloading {0} {1}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:65
+msgid "Got more than one object when expecting only one."
+msgstr "Got more than one object when expecting only one."
+
+#: /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 "Unknown version"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr "Found <seg> tag on non-way."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr "Incomplete segment with id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr "NullPointerException. Possible some missing tags."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr "Illegal object with id=0"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr "Couldn''t read time format \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr "Missing required attribute \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr "Preparing data..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr "Illformed Node id"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Upload {0} {1} ({2})..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+msgid "Unknown host"
+msgstr "Unknown host"
+
+#: /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 "Data error: lat value \"{0}\" is out of bound."
+
+#: /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 "Data error: lon value \"{0}\" is out of bound."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Could not detect data format string."
+
+#: /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 ""
+"Format string in data is incomplete or not found. Try setting an manual "
+"format string in Preferences."
+
+#: /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 ""
+"Format string is incomplete. Need at least 'lat' and 'lon' specification"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Unknown data type: \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+msgid "Maybe add an format string in preferences."
+msgstr "Maybe add an format string in preferences."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Parsing error in line {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Downloading points {0} to {1}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
+msgid "Downloading OSM data..."
+msgstr "Downloading OSM data..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
+msgid "Incorrect password or username."
+msgstr "Incorrect password or username."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Warning: The password is transferred unencrypted."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+msgid "Save user and password (unencrypted)"
+msgstr "Save user and password (unencrypted)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
+msgid "Aborting..."
+msgstr "Aborting..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Error during parse."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+msgid "position"
+msgstr "position"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+msgid "different"
+msgstr "different"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "deleted"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "true"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "false"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "none"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+msgid "segments"
+msgstr "segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+msgid "to"
+msgstr "to"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "from"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr "new"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr "unknown"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#, fuzzy, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} node"
+msgstr[1] "{0} node"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr "incomplete"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
+msgid "background"
+msgstr "background"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+msgid "incomplete way"
+msgstr "incomplete way"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+msgid "selected"
+msgstr "selected"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+msgid "gps point"
+msgstr "gps point"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "scale"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Resolve {0} conflicts in {1} objects"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Change"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr "Sequence"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Remove \"{0}\" for"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Set {0}={1} for"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#, fuzzy
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "object"
+msgstr[1] "object"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:168
+msgid "Files"
+msgstr "Files"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
+msgid "Connection"
+msgstr "Connection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
+msgid "Layer"
+msgstr "Layer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:199
+msgid "Help"
+msgstr "Help"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:242
+msgid "unnamed"
+msgstr "unnamed"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:292
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr "The projection could not be read from preferences. Using EPSG:4263."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:348
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignoring malformed url: \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:358
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignoring malformed file url: \"{0}\""
+
+#~ 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 ""
+#~ "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"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Cannot open preferences directory: {0}"
+
+#~ msgid ""
+#~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
+#~ msgstr ""
+#~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
Index: /po/fr.po
===================================================================
--- /po/fr.po	(revision 122)
+++ /po/fr.po	(revision 123)
@@ -7,6 +7,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-21 00:28+0200\n"
-"PO-Revision-Date: 2006-07-19 16:23+0200\n"
+"POT-Creation-Date: 2006-07-23 18:02+0200\n"
+"PO-Revision-Date: 2006-07-21 21:36+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
 "Language-Team: French <josm-fr@eigenheimstrasse.de>\n"
@@ -374,7 +374,7 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Java Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
+msgstr "Java Version {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
@@ -400,7 +400,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-#, fuzzy
 msgid "Contribution"
-msgstr "Connexion"
+msgstr "Contribution"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
@@ -778,5 +777,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
 msgid "Please enter a search string."
-msgstr "Merci d'entrer le texte à rechercher."
+msgstr "Entrer le texte à rechercher."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
@@ -902,9 +901,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 msgid "Please select a key"
-msgstr "Merci de sélectionner une clé"
+msgstr "Sélectionner une clé"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 msgid "Please select a value"
-msgstr "Merci de sélectionner une valeur"
+msgstr "Sélectionner une valeur"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
@@ -917,12 +916,12 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#, fuzzy, java-format
+#, java-format
 msgid "Could not read annotation preset source: {0}"
-msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+msgstr "Impossible de lire le fichier d'annotations : {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error parsing {0}: "
-msgstr "Erreur pendant le traitement {0}"
+msgstr "Erreur de traitement {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
@@ -959,5 +958,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:190
 msgid "Edit"
 msgstr "Éditer"
@@ -974,10 +973,9 @@
 #, java-format
 msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr ""
+msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:220
-#, fuzzy
 msgid "Change Properties"
-msgstr "Propriétés"
+msgstr "Changer les propriétés"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
@@ -1469,5 +1467,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
 msgid "Annotation preset source"
-msgstr ""
+msgstr "Source du fichier d'annotations"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
@@ -1524,13 +1522,14 @@
 "http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
 msgstr ""
+"Sources (URL ou fichier) des fichiers d'annotations prédéfinies. Voir http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
 msgid "Add a new annotation preset source to the list."
-msgstr ""
+msgstr "Ajouter un nouveau fichier d'annotations à la liste."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
-#, fuzzy
 msgid "Delete the selected source from the list."
-msgstr "Supprimer le calque sélectionné."
+msgstr "Supprimer la source sélectionné de la liste."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
@@ -1549,7 +1548,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
-#, fuzzy
 msgid "Language"
-msgstr "usage"
+msgstr "Langue"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
@@ -1608,5 +1606,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
 msgid "Annotation preset sources"
-msgstr ""
+msgstr "Sources des annotations prédéfinies"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1820,5 +1818,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "scale"
-msgstr ""
+msgstr "mesure"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
@@ -1851,25 +1849,25 @@
 msgstr[1] "objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:168
 msgid "Files"
 msgstr "Fichiers"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:173
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:180
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
 msgid "Layer"
 msgstr "Calque"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:194
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:199
 msgid "Help"
 msgstr "Aide"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:242
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:292
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1877,10 +1875,10 @@
 "utilisé."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:343
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:348
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:353
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:358
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -1888,11 +1886,11 @@
 
 #~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Impossible d'ouvrir le répertoire des préférences : {0}"
+#~ msgstr "Impossible d'ouvrir le rÃÂ©pertoire des prÃÂ©fÃÂ©rences : {0}"
 
 #~ msgid ""
 #~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
 #~ msgstr ""
-#~ "Les préférences pourraient ne pas être chargées. Écrivez les préférences "
-#~ "par défaut dans \"{0}\"."
+#~ "Les prÃÂ©fÃÂ©rences pourraient ne pas ÃÂªtre chargÃÂ©es. ÃÂcrivez les "
+#~ "prÃÂ©fÃÂ©rences par dÃÂ©faut dans \"{0}\"."
 
 #~ msgid ""
@@ -1933,49 +1931,58 @@
 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 #~ msgstr ""
-#~ "JavaÃÂÃÂ·OpenStreetMapÃÂÃÂ·Editor\n"
+#~ "JavaÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·OpenStreetMapÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·Editor\n"
 #~ "\n"
 #~ "usage:\n"
-#~ "\tjavaÃÂÃÂ·-jarÃÂÃÂ·josm.jarÃÂÃÂ·<option>ÃÂÃÂ·<option>ÃÂÃÂ·<option>...\n"
+#~ "\tjavaÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·-jarÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·josm."
+#~ "jarÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·<option>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·<option>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·<option>...\n"
 #~ "\n"
 #~ "options:\n"
 #~ "\t--help|-?|-"
-#~ "hÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·Montre "
+#~ "hÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·Montre "
 #~ "cette aide\n"
 #~ "\t--geometry=widthxheight(+|-)x(+|-)"
-#~ "yÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·Argument de gÃÂÃÂ©omÃÂÃÂ©trie "
-#~ "standard d'UNIX\n"
-#~ "\t[--download=]minlat,minlon,maxlat,maxlonÃÂÃÂ·ÃÂÃÂ·TÃÂÃÂ©lÃÂÃÂ©charge la "
-#~ "boÃÂÃÂ®te de coordonnÃÂÃÂ©es\n"
+#~ "yÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·Argument "
+#~ "de gÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©omÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©trie standard d'UNIX\n"
+#~ "\t[--download=]minlat,minlon,maxlat,"
+#~ "maxlonÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·TÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©lÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©charge "
+#~ "la boÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ®te de coordonnÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©es\n"
 #~ "\t[--download=]"
-#~ "<url>ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·TÃÂÃÂ©lÃÂÃÂ©charge "
-#~ "ce qui ce situe ÃÂÃÂ  l'URLÃÂÃÂ·(avecÃÂÃÂ·lat=x&lon=y&zoom=z)\n"
+#~ "<url>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·TÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©lÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©charge "
+#~ "ce qui ce situe ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ  l'URLÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·"
+#~ "(avecÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·lat=x&lon=y&zoom=z)\n"
 #~ "\t[--download=]"
-#~ "<nomdufichier>ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ouvrir "
-#~ "un fichierÃÂÃÂ·(en GPS brut siÃÂÃÂ·.gpxÃÂÃÂ·ouÃÂÃÂ·.csv)\n"
-#~ "\t--downloadgps=minlat,minlon,maxlat,maxlonÃÂÃÂ·TÃÂÃÂ©lÃÂÃÂ©charge la "
-#~ "boÃÂÃÂ®te de coordonnÃÂÃÂ©es en GPS brut.\n"
+#~ "<nomdufichier>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ouvrir "
+#~ "un fichierÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·(en GPS brut siÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·."
+#~ "gpxÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ouÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·.csv)\n"
+#~ "\t--downloadgps=minlat,minlon,maxlat,"
+#~ "maxlonÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·TÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©lÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©charge la "
+#~ "boÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ®te de coordonnÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©es en GPS brut.\n"
 #~ "\t--"
-#~ "selection=<texte>ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·SÃÂÃÂ©lectionne "
+#~ "selection=<texte>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·SÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©lectionne "
 #~ "en fonction de l'objet de recherche\n"
 #~ "\t--no-"
-#~ "fullscreenÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·Ne "
-#~ "pas lancer en mode plein ÃÂÃÂ©cran\n"
+#~ "fullscreenÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·Ne "
+#~ "pas lancer en mode plein ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©cran\n"
 #~ "\t--reset-"
-#~ "preferencesÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ·ÃÂÃÂ· "
-#~ "PrÃÂÃÂ©fÃÂÃÂ©rences par dÃÂÃÂ©faut\n"
+#~ "preferencesÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ· "
+#~ "PrÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©fÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©rences par dÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©faut\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?"
+#~ "\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."
+#~ "\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"
+#~ "\tjavaÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·-jarÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·josm."
+#~ "jarÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·43.2,11.1,43.4,11.4\n"
 #~ "\n"
-#~ "Les paramÃÂÃÂ¨tres sont lus dans l'ordre dans lequel ils sont "
-#~ "spÃÂÃÂ©cifiÃÂÃÂ©s, soyez donc sur d'avoir des donnÃÂÃÂ©es avant --"
-#~ "selection\n"
+#~ "Les paramÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ¨tres sont lus dans l'ordre dans lequel ils sont "
+#~ "spÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©cifiÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©s, soyez donc sur d'avoir des "
+#~ "donnÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©es avant --selection\n"
 #~ "\n"
-#~ "Au lieu de --download=<bbox>ÃÂÃÂ·vous pouvez spÃÂÃÂ©cifierÃÂÃÂ·osm://"
-#~ "<bbox>\n"
+#~ "Au lieu de --download=<bbox>ÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·vous pouvez "
+#~ "spÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ©cifierÃÂÃÂÃÂÃÂÃÂÃÂÃÂÃÂ·osm://<bbox>\n"
Index: /src/org/openstreetmap/josm/Main.java
===================================================================
--- /src/org/openstreetmap/josm/Main.java	(revision 122)
+++ /src/org/openstreetmap/josm/Main.java	(revision 123)
@@ -147,5 +147,10 @@
 		final Action annotationTesterAction = new AbstractAction(){
 			public void actionPerformed(ActionEvent e) {
-				String[] args = pref.get("annotation.sources").split(";");
+				String annotationSources = pref.get("annotation.sources");
+				if (annotationSources.equals("")) {
+					JOptionPane.showMessageDialog(Main.parent, "You have to specify annotation sources in the preferences first.");
+					return;
+				}
+				String[] args = annotationSources.split(";");
 				new AnnotationTester(args);
 			}
Index: /src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 122)
+++ /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 123)
@@ -132,5 +132,5 @@
 	 */
 	private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
-	private JComboBox languages = new JComboBox(new Locale[]{Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH});
+	private JComboBox languages = new JComboBox(new Locale[]{new Locale("en", "US"), new Locale("en", "GB"), Locale.GERMAN, Locale.FRENCH});
 	/**
 	 * The main tab panel.
Index: /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java	(revision 122)
+++ /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java	(revision 123)
@@ -2,4 +2,5 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.GridBagLayout;
@@ -84,4 +85,5 @@
 		String label;
 		JComboBox combo;
+		private final String[] values;
 
 		public void addToPanel(JPanel p) {
@@ -89,13 +91,15 @@
 			p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
 		}
-		public Combo(String key, String label, String def, String[] values, boolean editable) {
+		public Combo(String key, String label, String def, String[] values, String[] displayedValues, boolean editable) {
 			this.key = key;
 			this.label = label;
-			combo = new JComboBox(values);
+			this.values = values;
+			combo = new JComboBox(displayedValues);
 			combo.setEditable(editable);
 			combo.setSelectedItem(def);
 		}
 		public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
-			String str = combo.isEditable()?combo.getEditor().getItem().toString() : combo.getSelectedItem().toString();
+			String v = combo.getSelectedIndex() == -1 ? null : values[combo.getSelectedIndex()];
+			String str = combo.isEditable()?combo.getEditor().getItem().toString() : v;
 			cmds.add(new ChangePropertyCommand(sel, key, str));
 		}
@@ -164,6 +168,17 @@
 				String[] values = a.getValue("values").split(",");
 				String s = a.getValue("readonly");
-				boolean editable = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
-				current.add(new Combo(a.getValue("key"), a.getValue("text"), a.getValue("default"), values, editable));
+				String dvstr = a.getValue("display_values");
+				boolean editable = s == null  || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+				if (dvstr != null) {
+					if (editable && s != null)
+						throw new SAXException(tr("Cannot have a writable combobox with default values (line {0})", getLineNumber()));
+					editable = false; // for combos with display_value readonly default to false
+				}
+				String[] displayValues = dvstr == null ? values : dvstr.split(",");
+				if (displayValues.length != values.length)
+					throw new SAXException(tr("display_values ({0}) and values ({1}) must be of same number of elements.",
+							displayValues.length+" "+trn("element", "elements", displayValues.length),
+							values.length+" "+trn("element", "elements", values.length)));
+				current.add(new Combo(a.getValue("key"), a.getValue("text"), a.getValue("default"), values, displayValues, editable));
 			} else if (qname.equals("key"))
 				current.add(new Key(a.getValue("key"), a.getValue("value")));
Index: /src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java	(revision 122)
+++ /src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java	(revision 123)
@@ -59,4 +59,6 @@
 		annotationPanel.removeAll();
 		AnnotationPreset preset = (AnnotationPreset)annotationPresets.getSelectedItem();
+		if (preset == null)
+			return;
 		JPanel p = preset.createPanel();
 		p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
