Index: /CONTRIBUTION
===================================================================
--- /CONTRIBUTION	(revision 114)
+++ /CONTRIBUTION	(revision 115)
@@ -20,4 +20,9 @@
 Several smaller patches are contributed by community members
 of OSM.
+
+Internalisation:
+German (not finished): Sven Anders <sven@anders-hamburg.de>
+French: Frédéric Bonifas <fredericbonifas@gmail.com>
+
 
 All the rest are belong to me.
Index: /build.xml
===================================================================
--- /build.xml	(revision 114)
+++ /build.xml	(revision 115)
@@ -75,4 +75,7 @@
     		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lde ${po}/de.po"/>
     	</exec>
+    	<exec executable="msgfmt">
+    		<arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lfr ${po}/fr.po"/>
+    	</exec>
     </target>
 
Index: /po/de.po
===================================================================
--- /po/de.po	(revision 114)
+++ /po/de.po	(revision 115)
@@ -6,5 +6,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-17 02:43+0200\n"
+"POT-Creation-Date: 2006-07-19 01:26+0200\n"
 "PO-Revision-Date: 2006-07-16 23:44+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -23,5 +23,4 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
@@ -186,5 +185,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:172
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -298,5 +297,4 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:236
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
@@ -886,21 +884,20 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:238
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
+msgid "Please select the row to edit."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
+msgid "Please select the row to delete."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+msgid "Add a new key/value pair to all objects"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
 #: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
 msgid "Edit"
 msgstr "Bearbeiten"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
-msgid "Please select the row to edit."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
-msgid "Please select the row to delete."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
-msgid "Add a new key/value pair to all objects"
-msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
@@ -956,5 +953,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
 msgid "track"
 msgid_plural "tracks"
@@ -962,5 +959,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
 msgid "point"
 msgid_plural "points"
@@ -968,5 +965,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
 #, java-format
 msgid "a track with {0} point"
@@ -975,10 +972,10 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} consists of {1} track"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
 #, java-format
 msgid "{0} point"
@@ -987,30 +984,30 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
 msgid "Customize Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "OK"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55
 msgid "Cancel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 msgid "Import images"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
 msgid "JPEG images (*.jpg)"
@@ -1135,96 +1132,93 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:159
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Java Open Street Map - Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:199
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
 msgid "layer not in list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:51
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:52
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
 msgid "There are unsaved changes. Really quit?"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "Unsaved Changes"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:74
-#, fuzzy
-msgid ""
-"Java OpenStreetMap Editor\n"
-"\n"
-"usage:\n"
-"\tjava -jar josm.jar <option> <option> <option>...\n"
-"\n"
-"options:\n"
-"\t--help|-?|-h                              Show this help\n"
-"\t--geometry=widthxheight(+|-)x(+|-)y       Standard unix geometry argument\n"
-"\t[--download=]minlat,minlon,maxlat,maxlon  Download the bounding box\n"
-"\t[--download=]<url>                        Download the location at the url "
-"(with lat=x&lon=y&zoom=z)\n"
-"\t[--download=]<filename>                   Open file (as raw gps, if .gpx "
-"or .csv)\n"
-"\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw "
-"gps\n"
-"\t--selection=<searchstring>                Select with the given search\n"
-"\t--no-fullscreen                           Don't launch in fullscreen mode\n"
-"\t--reset-preferences                       Reset the preferences to "
-"default\n"
-"\n"
-"examples:\n"
-"\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"
-"\tjava -jar josm.jar http://www.openstreetmap.org/index.html?"
-"lat=43.2&lon=11.1&zoom=13\n"
-"\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/"
-"OSM_errors_node-duplicate.xml\n"
-"\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"
-"\n"
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#, fuzzy
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap - Editor "
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "usage"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106
+msgid "options"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107
+msgid "Show this help"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109
+msgid "Download the bounding box"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110
+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:111
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113
+msgid "Select with the given search"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgid "Don't launch in fullscreen mode"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "Reset the preferences to default"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "Set the language. Example: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117
+msgid "examples"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection\n"
-"\n"
-"Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
-"Java OpenStreetMap Editor\n"
-"\n"
-"Aufruf:\n"
-"\tjava -jar josm.jar <option> <option> <option>...\n"
-"\n"
-"options:\n"
-"\t--help|-?|-h                              Zeige diese Hilfe an\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>                   Datei öffnen (als roh gps, wenn ."
-"gpx oder .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                           Nicht im Fullscreenmodus "
-"starten\n"
-"\t--reset-preferences                       Einstellungen auf "
-"Voreinstellungen zurücksetzen\n"
-"\n"
-"Beispiele:\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"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:101
+"some data before --selection"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:125
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:131
 #, java-format
 msgid "Cannot open preferences directory: {0}"
@@ -1337,74 +1331,82 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:90
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:100
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:101
 msgid "OptionPane.cancelButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:155
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+msgid "Draw large GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:161
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:219
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:221
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:222
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:225
+msgid "Draw larger dots for the GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:226
 #, fuzzy
 msgid "Draw direction hints for all segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:241
 msgid "Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:238
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:242
 msgid "Name"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
 #, fuzzy
 msgid "Choose"
 msgstr "Bereich auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:267
 msgid "Please select a color."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:268
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:272
 #, fuzzy, java-format
 msgid "Choose a color for {0}"
 msgstr "Farbe auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:276
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:281
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:283
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1416,5 +1418,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:286
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:290
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1422,13 +1424,13 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:291
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
 msgid "Display Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1436,34 +1438,34 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:293
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:297
 msgid "Look and Feel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:299
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:304
 msgid "Colors"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
 msgid "Connection Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
 #, fuzzy
 msgid "Connection Settings to the OSM server."
 msgstr "Kartendaten zum OSM Server speichern"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
 msgid "Base Server URL"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:314
 msgid "OSM username (email)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:316
 msgid "OSM password"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:318
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1472,17 +1474,17 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:322
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Map Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:333
 msgid "Projection method"
 msgstr ""
@@ -1770,4 +1772,78 @@
 msgstr ""
 
+#, fuzzy
+#~ 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"
+#~ "Aufruf:\n"
+#~ "\tjava -jar josm.jar <option> <option> <option>...\n"
+#~ "\n"
+#~ "options:\n"
+#~ "\t--help|-?|-h                              Zeige diese Hilfe an\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>                   Datei öffnen (als roh gps, "
+#~ "wenn .gpx oder .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                           Nicht im Fullscreenmodus "
+#~ "starten\n"
+#~ "\t--reset-preferences                       Einstellungen auf "
+#~ "Voreinstellungen zurücksetzen\n"
+#~ "\n"
+#~ "Beispiele:\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 "F12"
 #~ msgstr "F12"
Index: /po/fr.po
===================================================================
--- /po/fr.po	(revision 115)
+++ /po/fr.po	(revision 115)
@@ -0,0 +1,1906 @@
+# translation of fr.po to
+# Frederic Bonifas <fredericbonifas@gmail.com>, 2006. <>, 2006.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-19 01:28+0200\n"
+"PO-Revision-Date: 2006-07-18 20:27+0200\n"
+"Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
+"Language-Team: French <josm-fr@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 "Ajouter un segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
+msgid "Add a segment between two nodes."
+msgstr "Ajouter un segment entre deux noeuds"
+
+#: /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:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+msgid "Delete"
+msgstr "Supprimer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
+msgid "Delete nodes, streets or segments."
+msgstr "Supprimer les noeuds, les rues ou les segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
+msgid "Cannot delete node."
+msgstr "Impossible de supprimer le noeud"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
+msgid "This object is in use."
+msgstr "Cet objet est en utilisation"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
+msgid "Used by more than two segments."
+msgstr "Utilisé par plus de deux segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
+msgid "Used by only one segment."
+msgstr "Utilisé par un seul segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
+msgid "Used in a way."
+msgstr "Utilisé pour un chemin"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+msgid "Wrong direction of segments."
+msgstr "Segments dans la mauvaise direction"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+msgid "Conflicting keys"
+msgstr "Clés conflictuelles"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:200
+msgid "Delete Node"
+msgstr "Supprimer un noeud"
+
+#: /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 ""
+"Zoomer en sélectionnant une zone à la souris. (Ctrl+haut, gauche, bas, "
+"droite, +, -)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Selection"
+msgstr "Sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
+msgid "Select objects by dragging or clicking."
+msgstr ""
+"Sélectionner des objets en cliquant ou en définissant une zone à la souris"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Straight line"
+msgstr "Ligne droite"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+msgid "Select objects in a straight line."
+msgstr "Sélectionner les objets sur une ligne droite"
+
+#: /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 "Déplacer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
+msgid "Move selected objects around."
+msgstr "Déplacer les objets sélectionnés"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
+msgid "Cannot move objects outside of the world."
+msgstr "Impossible de déplacer les objets en dehors du monde"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add Way"
+msgstr "Ajouter un chemin"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+msgid "Add a new way to the data."
+msgstr "Ajouter un nouveau chemin aux données"
+
+#: /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 ""
+"Attention : ce chemin est incomplet.Essayez de le télécharger en entier "
+"avant d'ajouter des 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] ""
+"Le chemin {0}·a été sélectionné.\n"
+"Souhaitez-vous plutôt sélectionner tous les segments appartenant à ce "
+"chemin ?Les chemins {0}·ont été sélectionnés.\n"
+"Souhaitez-vous plutôt sélectionner tous les segments appartenant à ces "
+"chemins ?"
+msgstr[1] ""
+"Le chemin {0}·a été sélectionné.\n"
+"Souhaitez-vous plutôt sélectionner tous les segments appartenant à ce "
+"chemin ?Les chemins {0}·ont été sélectionnés.\n"
+"Souhaitez-vous plutôt sélectionner tous les segments appartenant à ces "
+"chemins ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+msgid "Add segments from ways"
+msgstr "Ajouter des segments aux chemins"
+
+#: /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 ""
+"Souhaitez-vous ajouter tous les autres segments sélectionnés au chemin "
+"sélectionné ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+msgid "Add segments to way?"
+msgstr "Ajouter des segments au chemin ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder all line segments?"
+msgstr "Réorganiser tous les segments de la ligne ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+msgid "Reorder?"
+msgstr "Réorganiser ?"
+
+#: /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] "Créer un nouveau chemin hors de {0} segments ?"
+msgstr[1] "Créer un nouveau chemin hors de {0} segments ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+msgid "Create new way"
+msgstr "Créer un nouveau chemin"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add node"
+msgstr "Ajouter un noeud"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
+msgid "Add a new node to the map"
+msgstr "Ajouter un nouveau noeud à la carte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add node into segment"
+msgstr "Ajouter un noeud dans un segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+msgid "Add a node into an existing segment"
+msgstr "Ajouter un noeud dans un segment existant"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
+msgid "Can not add a node outside of the world."
+msgstr "Impossible d'ajouter un noeud en dehors du monde"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
+msgid "Add Node into Segment"
+msgstr "Ajouter un noeud dans un segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:172
+msgid "Preferences"
+msgstr "Préférences"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+msgid "Open a preferences page for global settings."
+msgstr "Ouvrir la page des préférences pour les réglages généraux"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open"
+msgstr "Ouvrir"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+msgid "Open a file."
+msgstr "Ouvrir un fichier"
+
+#: /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 ""
+"L'import des données CSV pour les données non GPS n'est pas encore "
+"implémenté."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Extension de fichier inconnue"
+
+#: /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 "Calque de données"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Erreur pendant le traitement {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Impossible de lire \"{°}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo"
+msgstr "Annuler"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Annuler la dernière action"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+msgid "Downloading data"
+msgstr "Téléchargement des données"
+
+#: /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 "Aucune donnée importée"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:95
+msgid "Downloading GPS data"
+msgstr "Téléchargement des données GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:125
+msgid "Open as raw gps data"
+msgstr "Ouvrir avec les données GPS brutes"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download from OSM"
+msgstr "Télécharger depuis OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:128
+msgid "Download map data from the OSM server."
+msgstr "Télécharger une carte de données depuis le serveur OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:140
+msgid ""
+"Move and zoom the image like the main map. Select an area to download by "
+"dragging."
+msgstr ""
+"Déplacer ou zoomer sur l'image comme pour la carte principale. Sélectionner "
+"une zone à télécharger en faisant glisser la souris bouton principal enfoncé."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:143
+msgid "Bounding box"
+msgstr "Zone sélectionnée"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:144
+msgid "min lat"
+msgstr "lat min"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
+msgid "min lon"
+msgstr "long min"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
+msgid "max lat"
+msgstr "lat max"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
+msgid "max lon"
+msgstr "long max"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
+msgid "URL from www.openstreetmap.org"
+msgstr "URL depuis www.openstreetmap.org"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
+msgid "Bookmarks"
+msgstr "Marque-pages"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
+msgid "Add"
+msgstr "Ajouter"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
+msgid "Please enter the desired coordinates first."
+msgstr "Entrez les coordonnées désirées en premier"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
+msgid "Please enter a name for the location."
+msgstr "Entrez un nom pour cet emplacement"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
+msgid "Remove"
+msgstr "Supprimer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
+msgid "Select a bookmark first."
+msgstr "Sélectionner un marque-page en premier"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
+msgid "Choose an area"
+msgstr "Choisir une zone"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
+msgid "Please enter the desired coordinates or click on a bookmark."
+msgstr "Entrez les coordonnées désirées ou cliquez sur un marque-page"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit"
+msgstr "Quitter"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+msgid "Exit the application."
+msgstr "Quitter l'application"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+msgid "About"
+msgstr "À propos"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+msgid "Display the about screen."
+msgstr "Montrer l'à propos"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
+#, java-format
+msgid "Java OpenStreetMap Editor Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
+#, java-format
+msgid "last change at {0}"
+msgstr "dernier changement à {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
+msgid "Homepage"
+msgstr "Page d'accueil"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+msgid "Bug Reports"
+msgstr "Rapports de bug"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+msgid "Info"
+msgstr "Info"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+msgid "Readme"
+msgstr "Lisez-moi"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+msgid "Revision"
+msgstr "Révision"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
+msgid "About JOSM..."
+msgstr "À propos de JOSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+msgid "File could not be found."
+msgstr "Impossible de trouver le fichier"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "File exists. Overwrite?"
+msgstr "Le fichier existe déjà. Écrire dessus ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+msgid "Overwrite"
+msgstr "Écrire dessus"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+msgid "data"
+msgstr "données"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+msgid "selection"
+msgstr "sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+msgid "layer"
+msgstr "calque"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "conflict"
+msgstr "conflit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#, java-format
+msgid "Auto Scale: {0}"
+msgstr "Zoom auto : {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 ""
+"Zoomer automatiquement sur la vue ({0}) (Annuler si la vue est déplacée)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload to OSM"
+msgstr "Charger sur OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload all changes to the OSM server."
+msgstr "Charger tous les segments sur le serveur d'OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
+msgid "Nothing to upload. Get some data first."
+msgstr "Rien à charger. Obtenez d'abord des données."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr ""
+"Certains conflits ne sont pas résolus. Vous devez d'abord les résoudre."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Uploading data"
+msgstr "Charger les données"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
+msgid "No changes to upload."
+msgstr "Aucuns changements à charger"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
+msgid "Objects to add:"
+msgstr "Objets à ajouter :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
+msgid "Objects to modify:"
+msgstr "Objets à modifier :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
+msgid "Objects to delete:"
+msgstr "Objets à supprimer :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
+msgid "Upload this changes?"
+msgstr "Charger ces changements ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+msgid "OSM Server Files (.osm .xml)"
+msgstr "Fichiers d'un serveur OSM (.osm .xml)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+msgid "GPX Files (.gpx)"
+msgstr "Fichiers GPX (.gpx)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+msgid "CSV Files (.csv .txt)"
+msgstr "Fichiers CSV (.csv .txt)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo"
+msgstr "Refaire"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refaire la dernière action annulée"
+
+#: /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] "Télchargement de {0} segments"
+msgstr[1] "Télchargement de {0} segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download incomplete objects"
+msgstr "Télécharger les objets incomplets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
+msgid "Download all (selected) incomplete ways from the OSM server."
+msgstr ""
+"Télécharger tous les chemins sélectionnés incomplets depuis le serveur OSM."
+
+#: /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 "Télécharger {0} chemins contenant un total de {1} segments ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:103
+msgid "Download?"
+msgstr "Télécharger ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Show background"
+msgstr "Montrer l'arrière-plan"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:15
+msgid "Download and show landsat background images."
+msgstr "Télécharger et montrer les images d'arrière-plan landsat."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+msgid "Not implemented yet."
+msgstr "Pas encore implémenté"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save"
+msgstr "Souvegarder"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
+msgid "Save the current data."
+msgstr "Sauvegarder les données actuelles"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
+msgid "No document open so nothing to save."
+msgstr "Aucun document ouvert donc rien à sauvegarder"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "The document contains no data. Save anyway?"
+msgstr "Le document ne contient aucune donnée. Sauvegarder quand même ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
+msgid "Empty document"
+msgstr "Document vide"
+
+#: /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 ""
+"Certains conflits ne sont pas résolus. Les conflits ne seront pas "
+"sauvegardés si vous ne les traitez pas. Continuer ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:44
+msgid "Conflicts"
+msgstr "Conflits"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
+msgid "CSV output not supported yet."
+msgstr "Sortie en CSV pas encore supportée"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
+msgid "Unknown file extension."
+msgstr "Extension de fichier inconnue"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
+msgid "An error occoured while saving."
+msgstr "Une erreur s'est produite pendant la sauvegarde."
+
+#: /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 : La GPL n'est pas compatible avec la licence d'OSM. Ne pas importer "
+"des traces sous licence GPL."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export to GPX"
+msgstr "Exporter en GPX"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
+msgid "Export the data to GPX file."
+msgstr "Exporter les données en un fichier GPX"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr "Rien à exporter.Obtenez d'abord des données"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+msgid "gps track description"
+msgstr "description de la trace GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:80
+msgid "Add author information"
+msgstr "Ajouter des informations sur l'auteur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:83
+msgid "Real name"
+msgstr "Nom réel"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+msgid "Email"
+msgstr "E-mail"
+
+#: /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 "Prédéfini"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:97
+msgid "Copyright year"
+msgstr "Année du copyright"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:105
+msgid "Keywords"
+msgstr "Mots-clés"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+msgid "Export options"
+msgstr "Options d'export"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+#, java-format
+msgid "Error while exporting {0}"
+msgstr "Erreur à l'export {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:130
+msgid "Error"
+msgstr "Erreur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:184
+msgid "Choose a predefined license"
+msgstr "Choisir une licence prédéfinie"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Do nothing"
+msgstr "Ne rien faire"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:39
+msgid "Report Bug"
+msgstr "Rapporter un 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 ""
+"Une exception inattendue est apparue.\n"
+"\n"
+"Cela est toujours du à une erreur de code. Si vous utilisez la dernière "
+"version de JOSM, il serait aimable de produire un rapport de bug."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:43
+msgid "Unexpected Exception"
+msgstr "Exception inattendue"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+msgid ""
+"Please send this to josm@eigenheimstrasse.de\n"
+"\n"
+msgstr ""
+"Merci d'envoyer cela à 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 ""
+"Merci d'envoyer un e-mail avec les informations suivantes à "
+"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:65
+msgid "Load Selection"
+msgstr "Charger la sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contact de {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+msgid "Downloading..."
+msgstr "Téléchargement..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#, java-format
+msgid "Could not read from url: \"{0}\""
+msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:92
+#, java-format
+msgid "Parsing error in url: \"{0}\""
+msgstr "Erreur d'analyse dans l'URL : \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+msgid "Current Selection"
+msgstr "Sélection actuelle"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+msgid "Open a selection list window."
+msgstr "Ouvrir une fenêtre de sélection de liste."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Select"
+msgstr "Sélectionner"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:136
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+"Remplacer les éléments de la carte par les éléments sélectionnés de cette "
+"liste."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
+msgid "Reload"
+msgstr "Recharger"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Refresh the selection list."
+msgstr "Actualiser la liste de sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:187
+msgid "Search"
+msgstr "Chercher"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+msgid "Search for objects."
+msgstr "Rechercher des objets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+msgid "Please enter a search string."
+msgstr "Merci d'entrer le texte à rechercher."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:160
+msgid ""
+"<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
+"'Street' in any key or name.</li><li><code>\"Baker Street\"</code>  - 'Baker "
+"Street' in any key or name.</li><li><code>name:Bak</code>  - 'Bak' anywhere "
+"in the name.</li><li><code>-name:Bak</code>  - not 'Bak' in the name.</"
+"li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
+msgstr ""
+"<html>Recherche du texte entier<ul><li><code>Baker·Street</code>··-"
+"·'Baker'·et·'Street'·dans les clés et les noms.</li><li><code>\"Baker·Street"
+"\"</code>··-·'Baker·Street'·dans les clés et les noms.</li><li><code>name:"
+"Bak</code>··-·'Bak'·n'importe où dans le nom.</li><li><code>-name:Bak</"
+"code>··-·pas de·'Bak'·dans le nom.</li><li><code>foot:</code>··-"
+"·key=foot·associé à n'importe quelle valeur.</ul></html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+msgid "replace selection"
+msgstr "remplacer la sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
+msgid "add to selection"
+msgstr "ajouter à la sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+msgid "remove from selection"
+msgstr "supprimer de la sélection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Conflict"
+msgstr "Conflit"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+msgid "Merging conflicts."
+msgstr "Gérer les conflits"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Résoudre"
+
+#: /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 ""
+"Ouvrir une une fenêtre de fusion des éléments sélectionnés de cette liste"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
+msgid "Please select something from the conflict list."
+msgstr "Sélectionnez un élément de la liste des conflits."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+msgid "Resolve Conflicts"
+msgstr "Résoudre les conflits"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+msgid "Command Stack"
+msgstr "Pile de commandes"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Ouvrir une liste de toutes les commandes (annuler le buffer)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
+msgid "Delete the selected layer."
+msgstr "Supprimer le calque sélectionné"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+msgid "Show/Hide"
+msgstr "Montrer/Cacher"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:81
+msgid "Toggle visible state of the selected layer."
+msgstr "Change la visibilité du calque sélectionné."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+msgid "Layers"
+msgstr "Calque"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+msgid "Open a list of all loaded layers."
+msgstr "Ouvrir une liste de tous les calques chargés."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
+msgid "Move the selected layer one row up."
+msgstr "Déplacer le calque sélectionné un étage au-dessus."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
+msgid "Move the selected layer one row down."
+msgstr "Déplacer le calque sélectionné un étage en-dessous."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
+msgid "Merge the selected layer into the layer directly below."
+msgstr ""
+"Fusionner les calques sélectionnés dans le calque directement en dessous."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#, fuzzy, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change {0} objects."
+msgstr[0] "Cela changera {0} objets."
+msgstr[1] "Cela changera {0} objets."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#, java-format
+msgid ""
+"Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
+msgstr ""
+"Merci de sélectionner une valeur pour \"{0}\". <br>(une chaîne de caractères "
+"vide supprime la clé)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+msgid "Change values?"
+msgstr "Changer les valeurs ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+msgid "<different>"
+msgstr "<différent>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+msgid "Please select a key"
+msgstr "Merci de sélectionner une clé"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+msgid "Please select a value"
+msgstr "Merci de sélectionner une valeur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+msgid "Properties"
+msgstr "Propriétés"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+msgid "Property for selected objects."
+msgstr "Propriétés des objets sélectionnés."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Key"
+msgstr "Clé"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+msgid "Value"
+msgstr "Valeur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
+msgid "Please select the row to edit."
+msgstr "Sélectionnez l'étage à éditer."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
+msgid "Please select the row to delete."
+msgstr "Sélectionner l'étage à supprimer."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+msgid "Add a new key/value pair to all objects"
+msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
+msgid "Edit"
+msgstr "Éditer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+msgid "Edit the value of the selected key for all objects"
+msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+msgid "Delete the selected key in all objects"
+msgstr "Supprimer la clé sélectionnée de tous les objets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#, fuzzy
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "noeud"
+msgstr[1] "noeud"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+#, fuzzy
+msgid "segment"
+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:135
+#, fuzzy
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "chemint"
+msgstr[1] "chemint"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+msgid "There were conflicts during import."
+msgstr "Il y a eu des conflits pendant l'import."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consiste en :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} supprimés)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:51
+msgid "Convert to data layer"
+msgstr "Convertir en un calque de données"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+#, fuzzy
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "trace"
+msgstr[1] "trace"
+
+#: /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] "une trace avec {0} points"
+msgstr[1] "une trace avec {0} points"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
+#, java-format
+msgid "{0} consists of {1} track"
+msgstr "{0} consiste en {1} traces"
+
+#: /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] "point {0}"
+msgstr[1] "point {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
+msgid "Customize Color"
+msgstr "Personnaliser la couleur"
+
+#: /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 "Annuler"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174
+msgid "Default"
+msgstr "Par défaut"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
+msgid "Choose a color"
+msgstr "Choisir une couler"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+msgid "Import images"
+msgstr "Import des 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 "images JPEG (*.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 "Lecture du 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 "Aucune heure pour le 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 "Impossible de lire l'heure \"{0}\" du point {1} x {2}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:105
+msgid "Time loop in gps data."
+msgstr "Boucle horaire dans les données GPS."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:111
+msgid "No images with readable timestamps found."
+msgstr "Aucune image avec des informations horaires lisibles trouvée."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:122
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lecture de {0}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:186
+msgid "Geotagged Images"
+msgstr "Images géomarquées"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:253
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Allumage du GPS : {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:254
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Extinction du GPS : {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
+#, java-format
+msgid "current delta: {0}s"
+msgstr "variation actuelle : {0}s"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:257
+msgid "timezone difference: "
+msgstr "différence de fuseau horaire : "
+
+#: /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} dans la trace."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+msgid "Sync clock"
+msgstr "Synchroniser l'horloge"
+
+#: /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 "La date du fichier \"{0}\" ne peut être analysée."
+
+#: /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 "Il n'y a aucune heure EXIF associée au fichier \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+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 "Entrez la date montrée (mm/jj/aaaa HH:MM:SS)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+msgid "GPS unit timezome (difference to photo)"
+msgstr "Zone haraire de l'unité GPS (différence avec la photo)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+msgid "Syncronize Time with GPS Unit"
+msgstr "Synchroniser l'heure avec l'unité GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+msgid "Time entered could not be parsed."
+msgstr "L'heure indiquée ne peut être analysée."
+
+#: /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 ""
+"Mauvaise transformation de longitude pour le cache. Ne peut pas opérer sur "
+"{0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java:57
+#, java-format
+msgid "WMS layer: {0}"
+msgstr "calque WMS :{0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
+msgid "Could not read bookmarks."
+msgstr "Impossible de lire les marque-pages"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
+msgid "Could not write bookmark."
+msgstr "Impossible d'écrire un marque-page."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+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 "le calque n'est pas dans la liste."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:52
+msgid "Hint: Some changes came from uploading new data to the server."
+msgstr ""
+"Indication : Certains changements viennent du chargment de nouvelles données "
+"sur le serveur."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
+msgid "There are unsaved changes. Really quit?"
+msgstr "Certains changements ne sont pas sauvegardés. Quitter quand même ?"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+msgid "Unsaved Changes"
+msgstr "Changements non sauvegardés"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#, fuzzy
+msgid "Java OpenStreetMap Editor"
+msgstr "Java·Open·Street·Map·-·Editor"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "usage"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#, fuzzy
+msgid "options"
+msgstr "Options d'export"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107
+msgid "Show this help"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109
+msgid "Download the bounding box"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110
+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:111
+msgid "Open file (as raw gps, if .gpx or .csv)"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113
+msgid "Select with the given search"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgid "Don't launch in fullscreen mode"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "Reset the preferences to default"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "Set the language. Example: "
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117
+msgid "examples"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+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:125
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:131
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Impossible d'ouvrir le répertoire des préférences : {0}"
+
+#: /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 "Objet"
+
+#: /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} objets ont des conflits :"
+msgstr[1] "{0} objets ont des conflits :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+msgid "my version:"
+msgstr "ma version :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+msgid "their version:"
+msgstr "leur version :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+msgid "resolved version:"
+msgstr "version résolue :"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
+msgid "Contacting the OSM server..."
+msgstr "Contact du servuer OSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
+msgid "Error while parsing"
+msgstr "Erreur d'analyse"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:84
+msgid "File Not found"
+msgstr "Fichier non trouvé"
+
+#: /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 "texte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+msgid "Name of the user."
+msgstr "Nom de l'utilisateur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+msgid "OSM Password."
+msgstr "Mot de passe OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr ""
+"Redimensionner l'applet aux proportions donnnées (format LARGEURxHAUTEUR)"
+
+#: /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 "texte;texte;..."
+
+#: /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 ""
+"Les télécharge tous. Peut être sous la forme \"x1,y1,x2,z2\" ou un URL "
+"contenant lat=y&lon=x&zoom=z ou encore un nom de fichier."
+
+#: /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 ""
+"Télécharger comme données GPS brutes. Peut être sous la forme x1,y1,x2,"
+"y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier."
+
+#: /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 ""
+"Les ajoute tous à la sélection initale. Cela peut être un texte de recherche "
+"comme pour Google ou un URL retournant du osm-xml"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "any"
+msgstr "n'importe"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+"Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
+
+#: /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 "Nom d'utilisateur"
+
+#: /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 "Mot de passe"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
+msgid "OptionPane.okButtonText"
+msgstr "OptionPane.okButtonText"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:90
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:101
+msgid "OptionPane.cancelButtonText"
+msgstr "OptionPane.cancelButtonText"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:155
+msgid "Draw lines between raw gps points."
+msgstr "Dessiner des lignes entre les points GPS bruts."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+msgid "Force lines if no segments imported."
+msgstr "Forcer les lignes si aucun segment importé"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+msgid "Draw large GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:161
+msgid "Draw Direction Arrows"
+msgstr "Dessiner les flèches de direction"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:221
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr ""
+"Force le dessin de lignes si les données importées ne contiennent pas "
+"d'informationsur les lignes."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:225
+msgid "Draw larger dots for the GPS points."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:226
+msgid "Draw direction hints for all segments."
+msgstr "Dessine les flèches de direction pour tous les segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:241
+msgid "Color"
+msgstr "Couleur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:242
+msgid "Name"
+msgstr "Nom"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+msgid "Choose"
+msgstr "Choisir"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:267
+msgid "Please select a color."
+msgstr "Sélectionner une couleur"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:272
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Choisir une couleur pour {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+msgid "The base URL to the OSM server (REST API)"
+msgstr "L'URL de base du serveur OSM (API)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
+msgid "Login name (email) to the OSM account."
+msgstr "Nom d'utilisateur (e-mail) à votre compte OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:281
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Mot de passe d'identification au compte OSM. Laisser blanc pour ne stocker "
+"aucun mot de passe."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
+msgid "The base URL to the server retrieving WMS background pictures from."
+msgstr "L'URL du serveur récupérant les images de l'arrière-plan WMS."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:283
+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 des spécifications. lat/lon et time sont importés.<br><b>lat</"
+"b> : la latitude<br><b>lon</b> :la longitude<br><b>time</b> :l'heure "
+"mesurée<br><b>ignore</b>:·sauter ce champ<br>Un exemple : "
+"\"ignore·ignore·lat·lon\"·utilisera·'·'·comme délimiteur, sautera les deux "
+"premières valeurs, et lira ensuite la latitude et la longitude<br>Un autre "
+"exemple : \"lat,lon\"·lira simplement la latitude et la longitude séparées "
+"par une virgule.</html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:290
+msgid ""
+"If your gps device draw to few lines, select this to draw lines along your "
+"way."
+msgstr ""
+"Si votre unité GPS dessine trop peu de lignes, sélectionnez ceci pour "
+"dessiner des lignes le long de votre chemin."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:291
+msgid "Colors used by different objects in JOSM."
+msgstr "Couleurs utilisées par les différents objets de JOSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+msgid "Display Settings"
+msgstr "Réglages d'affichage"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr ""
+"Divers réglages qui influencent la représentation visuelle de tout le "
+"programme."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:297
+msgid "Look and Feel"
+msgstr "Apparence et comportement"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:304
+msgid "Colors"
+msgstr "Couleurs"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+msgid "Connection Settings"
+msgstr "Réglages de connexion"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+msgid "Connection Settings to the OSM server."
+msgstr "Réglages de connexion au serveur OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+msgid "Base Server URL"
+msgstr "URL du serveur de base"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:314
+msgid "OSM username (email)"
+msgstr "Nom d'utilisateur d'OSM (e-mail)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:316
+msgid "OSM password"
+msgstr "Mot de passe d'OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:318
+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>ATTENTION : Le mot de passe est stocké en texte brut dans le fichier "
+"de préférences.<br>Le mot de passe est transféré en texte brut au serveur, "
+"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+msgid "CSV import specification (empty: read from first line in data)"
+msgstr ""
+"Spécifications de l'impors CSV (vide : lire depuis la prmière ligne de "
+"données)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+msgid "Map Settings"
+msgstr "Réglages de la carte"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+msgid "Settings for the map projection and data interpretation."
+msgstr ""
+"Régléges pour la projection de la carte et l'interprétation des données."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:333
+msgid "Projection method"
+msgstr "Méthode de projection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
+msgid "Conflicts in disjunct objects"
+msgstr "Conflits dans des objets disjoints"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:58
+#, java-format
+msgid "Downloading {0} {1}"
+msgstr "Téléchargement {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 "Plus de deux objets acquis alors qu'un seul était attendu."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:98
+msgid "Unknown version"
+msgstr "Version inconnue"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr "Tag <seg> trouvé en dehors d'un chemin."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr "Le segment avec l'id=0 est incomplet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr "NullPointerException.·Possibilité de tags manquants."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr "L'objet avec l'id=0 est illégal"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr "Impossible de lire le format horaire \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr "Attribut requis \"{0}\" manquant."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr "Préparation des données..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr "id du noeud malformé"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#, java-format
+msgid "Upload {0} {1} ({2})..."
+msgstr "Charge {0} {1} ({2})..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+msgid "Unknown host"
+msgstr "Hôte inconnu"
+
+#: /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 "Erreur de données : La valeur de latitude \"{0}\" est hors limite."
+
+#: /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 "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+msgid "Could not detect data format string."
+msgstr "Impossible de détecter le texte de format des données."
+
+#: /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 ""
+"Le format des données est incomplet ou non trouvé. Essayez de régler le "
+"format manuellement dans les préférences."
+
+#: /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 ""
+"Le texte de format est incomplet. Les spécifications 'lat' et 'long' au "
+"minimum sont requises."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#, java-format
+msgid "Unknown data type: \"{0}\"."
+msgstr "Type de données inconnu : \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+msgid "Maybe add an format string in preferences."
+msgstr "Définissez peut-être le format dans les préférences."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#, java-format
+msgid "Parsing error in line {0}"
+msgstr "Analyse de l'erreur ligne {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:44
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Téléchargement des points {0} {1}..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:88
+msgid "Downloading OSM data..."
+msgstr "Téléchargement des données OSM..."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
+msgid "Incorrect password or username."
+msgstr "Mot de passe ou nom d'utilisateur incorrect"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Attention : Le mot de passe est transféré non-crypté."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+msgid "Save user and password (unencrypted)"
+msgstr "Sauvegarder l'utilisateur et le mot de passe (non crypté)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
+msgid "Enter Password"
+msgstr "Entrer un mot de passe"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
+msgid "Aborting..."
+msgstr "Échec"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+msgid "Error during parse."
+msgstr "Erreur pendant l'analyse"
+
+#: /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 "différent"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+msgid "deleted"
+msgstr "supprimé"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "true"
+msgstr "vrai"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+msgid "false"
+msgstr "faux"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+msgid "none"
+msgstr "rien"
+
+#: /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 "depuis"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+msgid "from"
+msgstr "à"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "new"
+msgstr "nouveau"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+msgid "unknown"
+msgstr "inconnu"
+
+#: /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} noeud"
+msgstr[1] "{0} noeud"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+msgid "incomplete"
+msgstr "incomplet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+msgid "background"
+msgstr "arrière plan"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+msgid "incomplete way"
+msgstr "chemin incomplet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+msgid "selected"
+msgstr "sélectionné"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+msgid "gps point"
+msgstr "point GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#, java-format
+msgid "Resolve {0} conflicts in {1} objects"
+msgstr "Résoudre {0} conflits dans {1} objets"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+msgid "Change"
+msgstr "Changer"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+msgid "Sequence"
+msgstr "Séquence"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Remove \"{0}\" for"
+msgstr "Supprime \"{0}\" pour"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#, java-format
+msgid "Set {0}={1} for"
+msgstr "Affecte {0}={1} pour"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#, fuzzy
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "objet"
+msgstr[1] "objet"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
+msgid "Files"
+msgstr "Fichiers"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+msgid "Connection"
+msgstr "Connexion"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
+msgid "Layer"
+msgstr "Calque"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
+msgid "Help"
+msgstr "Aide"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+msgid "unnamed"
+msgstr "sans-nom"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:274
+#, java-format
+msgid ""
+"Preferences could not be loaded. Write default preference file to \"{0}\"."
+msgstr ""
+"Les préférences pourraient ne pas être chargées. Écrivez les préférences par "
+"défaut dans \"{0}\"."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:285
+msgid "The projection could not be read from preferences. Using EPSG:4263."
+msgstr ""
+"La projection ne peut être lue depuis les préférences. EPSG:4263 sera "
+"utilisé."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#, java-format
+msgid "Ignoring malformed url: \"{0}\""
+msgstr "Ignore l'URL malformé : \"{0}\""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#, java-format
+msgid "Ignoring malformed file url: \"{0}\""
+msgstr "Ignore le fichier malformé d'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······························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"
+#~ "\t[--download=]<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"
+#~ "\t--selection=<texte>················Sélectionne en fonction de l'objet "
+#~ "de recherche\n"
+#~ "\t--no-fullscreen···························Ne pas lancer en mode plein "
+#~ "écran\n"
+#~ "\t--reset-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?"
+#~ "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"
+#~ "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"
Index: /src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MainApplication.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/MainApplication.java	(revision 115)
@@ -13,4 +13,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
@@ -70,40 +71,6 @@
 		Thread.setDefaultUncaughtExceptionHandler(new BugReportExceptionHandler());
 
+		// construct argument table
 		List<String> argList = Arrays.asList(argArray);
-		if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
-			System.out.println(tr("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"));
-			System.exit(0);
-		}
-
-		final File prefDir = new File(Main.pref.getPreferencesDir());
-		if (prefDir.exists() && !prefDir.isDirectory()) {
-			JOptionPane.showMessageDialog(null, tr("Cannot open preferences directory: {0}",Main.pref.getPreferencesDir()));
-			return;
-		}
-		if (!prefDir.exists())
-			prefDir.mkdirs();
-
-		// construct argument table
 		Map<String, Collection<String>> args = new HashMap<String, Collection<String>>();
 		for (String arg : argArray) {
@@ -120,4 +87,52 @@
 		}
 
+		// very first thing to do is to setup the locale
+		if (args.containsKey("language") && !args.get("language").isEmpty() && args.get("language").iterator().next().length() >= 2) {
+			String s = args.get("language").iterator().next();
+			Locale l = null;
+			if (s.length() <= 2 || s.charAt(2) != '_')
+				l = new Locale(s);
+			else if (s.length() <= 5 || s.charAt(5) != '.')
+				l = new Locale(s.substring(0,2), s.substring(3));
+			else
+				l = new Locale(s.substring(0,2), s.substring(3,5), s.substring(6));
+			Locale.setDefault(l);
+		}
+		
+		if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
+			System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+
+					tr("usage")+":\n"+
+					"\tjava -jar josm.jar <option> <option> <option>...\n\n"+
+					tr("options")+":\n"+
+					"\t--help|-?|-h                              "+tr("Show this help")+"\n"+
+					"\t--geometry=widthxheight(+|-)x(+|-)y       "+tr("Standard unix geometry argument")+"\n"+
+					"\t[--download=]minlat,minlon,maxlat,maxlon  "+tr("Download the bounding box")+"\n"+
+					"\t[--download=]<url>                        "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+
+					"\t[--download=]<filename>                   "+tr("Open file (as raw gps, if .gpx or .csv)")+"\n"+
+					"\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
+					"\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+
+					"\t--no-fullscreen                           "+tr("Don't launch in fullscreen mode")+"\n"+
+					"\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+
+					"\t--language=<language>                     "+tr("Set the language. Example: ")+"\n\n"+
+					tr("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"+
+
+					tr("Parameters are read in the order they are specified, so make sure you load\n"+
+					"some data before --selection")+"\n\n"+
+					tr("Instead of --download=<bbox> you may specify osm://<bbox>\n"));
+			System.exit(0);
+		}
+
+		final File prefDir = new File(Main.pref.getPreferencesDir());
+		if (prefDir.exists() && !prefDir.isDirectory()) {
+			JOptionPane.showMessageDialog(null, tr("Cannot open preferences directory: {0}",Main.pref.getPreferencesDir()));
+			return;
+		}
+		if (!prefDir.exists())
+			prefDir.mkdirs();
+
 		preConstructorInit(args);
 		JFrame mainFrame = new JFrame(tr("Java Open Street Map - Editor"));
Index: /src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapScaler.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/MapScaler.java	(revision 115)
@@ -0,0 +1,29 @@
+package org.openstreetmap.josm.gui;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+
+import javax.swing.JComponent;
+
+public class MapScaler extends JComponent {
+
+	private final MapView mv;
+
+	public MapScaler(MapView mv) {
+		this.mv = mv;
+		setSize(100,30);
+		setOpaque(false);
+    }
+
+	@Override public void paint(Graphics g) {
+		double circum = mv.getScale()*100/Math.PI/2*40041455; // circumference of the earth in meter
+		String text = circum > 1000 ? (Math.round(circum/100)/10.0)+"km" : Math.round(circum)+"m";
+		g.setColor(Color.white);
+		g.drawLine(0, 5, 99, 5);
+		g.drawLine(0, 0, 0, 10);
+		g.drawLine(99, 0, 99, 10);
+		Rectangle2D bound = g.getFontMetrics().getStringBounds(text, g);
+		g.drawString(text, (int)(50-bound.getWidth()/2), 23);
+    }
+}
Index: /src/org/openstreetmap/josm/gui/MapSlider.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapSlider.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/MapSlider.java	(revision 115)
@@ -0,0 +1,51 @@
+package org.openstreetmap.josm.gui;
+
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.JSlider;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.openstreetmap.josm.data.coor.EastNorth;
+
+class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener {
+	
+    private final MapView mv;
+	boolean clicked = false;
+	
+	public MapSlider(MapView mv) {
+		super(0, 20);
+		setOpaque(false);
+		this.mv = mv;
+		addMouseListener(new MouseAdapter(){
+			@Override public void mousePressed(MouseEvent e) {
+				clicked = true;
+			}
+			@Override public void mouseReleased(MouseEvent e) {
+				clicked = false;
+			}
+		});
+		mv.addPropertyChangeListener("scale", this);
+		addChangeListener(this);
+	}
+	
+	public void propertyChange(PropertyChangeEvent evt) {
+		if (!getModel().getValueIsAdjusting())
+			setValue(this.mv.zoom());
+	}
+	
+	public void stateChanged(ChangeEvent e) {
+		if (!clicked)
+			return;
+		EastNorth pos = MapView.world;
+		for (int zoom = 0; zoom < getValue(); ++zoom)
+			pos = new EastNorth(pos.east()/2, pos.north()/2);
+		if (this.mv.getWidth() < this.mv.getHeight())
+			this.mv.zoomTo(this.mv.center, pos.east()*2/(this.mv.getWidth()-20));
+		else
+			this.mv.zoomTo(this.mv.center, pos.north()*2/(this.mv.getHeight()-20));
+	}
+}
Index: /src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapView.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/MapView.java	(revision 115)
@@ -8,8 +8,4 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,7 +14,4 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.Main;
@@ -87,36 +80,4 @@
 
 
-	private final class Scaler extends JSlider implements PropertyChangeListener, ChangeListener {
-		boolean clicked = false;
-		public Scaler() {
-			super(0, 20);
-			addMouseListener(new MouseAdapter(){
-				@Override public void mousePressed(MouseEvent e) {
-					clicked = true;
-				}
-				@Override public void mouseReleased(MouseEvent e) {
-					clicked = false;
-				}
-			});
-			MapView.this.addPropertyChangeListener("scale", this);
-			addChangeListener(this);
-		}
-		public void propertyChange(PropertyChangeEvent evt) {
-			if (!getModel().getValueIsAdjusting())
-				setValue(zoom());
-		}
-		public void stateChanged(ChangeEvent e) {
-			if (!clicked)
-				return;
-			EastNorth pos = world;
-			for (int zoom = 0; zoom < getValue(); ++zoom)
-				pos = new EastNorth(pos.east()/2, pos.north()/2);
-			if (MapView.this.getWidth() < MapView.this.getHeight())
-				zoomTo(center, pos.east()*2/(MapView.this.getWidth()-20));
-			else
-				zoomTo(center, pos.north()*2/(MapView.this.getHeight()-20));
-		}
-	}
-
 	public MapView(AutoScaleAction autoScaleAction) {
 		this.autoScaleAction = autoScaleAction;
@@ -134,8 +95,12 @@
 			}
 		});
-		Scaler zoomScaler = new Scaler();
-		zoomScaler.setOpaque(false);
-		add(zoomScaler);
-		zoomScaler.setBounds(0,0, 100, 30);
+
+		MapSlider zoomSlider = new MapSlider(this);
+		add(zoomSlider);
+		zoomSlider.setBounds(0,0, 100, 30);
+		
+		MapScaler scaler = new MapScaler(this);
+		add(scaler);
+		scaler.setLocation(10,30);
 	}
 
Index: /src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 115)
@@ -78,4 +78,5 @@
 			Main.pref.put("draw.rawgps.lines", drawRawGpsLines.isSelected());
 			Main.pref.put("draw.rawgps.lines.force", forceRawGpsLines.isSelected());
+			Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
 			Main.pref.put("draw.segment.direction", directionHint.isSelected());
 
@@ -157,4 +158,5 @@
 	 */
 	private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported."));
+	private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points."));
 	private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
 	private JTable colors;
@@ -220,4 +222,6 @@
 		forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force"));
 		forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected());
+		largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large"));
+		largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points."));
 		directionHint.setToolTipText(tr("Draw direction hints for all segments."));
 		directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
@@ -296,4 +300,5 @@
 		display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
 		display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));
+		display.add(largeGpsPoints, GBC.eop().insets(20,0,0,0));
 		display.add(directionHint, GBC.eop().insets(20,0,0,0));
 		display.add(new JLabel(tr("Colors")), GBC.eol());
Index: /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 115)
@@ -234,12 +234,12 @@
 			public void actionPerformed(ActionEvent e) {
 				int sel = propertyTable.getSelectedRow();
-				if (e.getActionCommand().equals(tr("Add")))
+				if (e.getActionCommand().equals("Add"))
 					add();
-				else if (e.getActionCommand().equals(tr("Edit"))) {
+				else if (e.getActionCommand().equals("Edit")) {
 					if (sel == -1)
 						JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
 					else
 						edit(sel);
-				} else if (e.getActionCommand().equals(tr("Delete"))) {
+				} else if (e.getActionCommand().equals("Delete")) {
 					if (sel == -1)
 						JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
Index: /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 115)
@@ -41,5 +41,5 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmIdReader;
-import org.openstreetmap.josm.io.ProgressReader;
+import org.openstreetmap.josm.io.ProgressInputStream;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -74,5 +74,5 @@
 			try {
 		        URLConnection con = url.openConnection();
-		        InputStream in = new ProgressReader(con, progress, currentAction);
+		        InputStream in = new ProgressInputStream(con, progress, currentAction);
 				currentAction.setText(tr("Downloading..."));
 				Map<Long, String> ids = idReader.parseIds(in);
Index: /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 114)
+++ /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java	(revision 115)
@@ -112,13 +112,19 @@
 			g.setColor(Color.GRAY);
 		Point old = null;
+		
+		boolean force = Main.pref.getBoolean("draw.rawgps.lines.force");
+		boolean lines = Main.pref.getBoolean("draw.rawgps.lines");
+		boolean large = Main.pref.getBoolean("draw.rawgps.large");
 		for (Collection<GpsPoint> c : data) {
-			if (!Main.pref.getBoolean("draw.rawgps.lines.force"))
+			if (!force)
 				old = null;
 			for (GpsPoint p : c) {
 				Point screen = mv.getPoint(p.eastNorth);
-				if (Main.pref.getBoolean("draw.rawgps.lines") && old != null)
+				if (lines && old != null)
 					g.drawLine(old.x, old.y, screen.x, screen.y);
-				else
+				else if (!large)
 					g.drawRect(screen.x, screen.y, 0, 0);
+				if (large)
+					g.fillRect(screen.x-1, screen.y-1, 3, 3);
 				old = screen;
 			}
Index: /src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- /src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 114)
+++ /src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 115)
@@ -30,5 +30,5 @@
 		if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
 			return null;
-		return new ProgressReader(activeConnection, progress, currentAction);
+		return new ProgressInputStream(activeConnection, progress, currentAction);
 	}
 }
Index: /src/org/openstreetmap/josm/io/ProgressInputStream.java
===================================================================
--- /src/org/openstreetmap/josm/io/ProgressInputStream.java	(revision 115)
+++ /src/org/openstreetmap/josm/io/ProgressInputStream.java	(revision 115)
@@ -0,0 +1,79 @@
+package org.openstreetmap.josm.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+
+import javax.swing.BoundedRangeModel;
+import javax.swing.JLabel;
+
+/**
+ * Read from an other reader and increment an progress counter while on the way.
+ * @author Imi
+ */
+public class ProgressInputStream extends InputStream {
+
+	private final InputStream in;
+	private final BoundedRangeModel progress;
+	private final JLabel currentAction;
+	private int readSoFar = 0;
+	private int lastDialogUpdate = 0;
+	private final URLConnection connection;
+
+	public ProgressInputStream(URLConnection con, BoundedRangeModel progress, JLabel currentAction) throws IOException {
+		this.connection = con;
+		this.in = con.getInputStream();
+		this.progress = progress;
+		this.currentAction = currentAction;
+		int contentLength = con.getContentLength();
+		if (contentLength > 0)
+			progress.setMaximum(contentLength);
+		else
+			progress.setMaximum(0);
+		progress.setValue(0);
+	}
+
+	@Override public void close() throws IOException {
+		in.close();
+	}
+
+	@Override public int read(byte[] b, int off, int len) throws IOException {
+		int read = in.read(b, off, len);
+		if (read != -1)
+			advanceTicker(read);
+		return read;
+	}
+
+	@Override public int read() throws IOException {
+		int read = in.read();
+		if (read != -1)
+			advanceTicker(1);
+		return read;
+	}
+
+	/**
+	 * Increase ticker (progress counter and displayed text) by the given amount.
+	 * @param amount
+	 */
+	private void advanceTicker(int amount) {
+		if (progress.getMaximum() == 0 && connection.getContentLength() != -1)
+			progress.setMaximum(connection.getContentLength());
+
+		readSoFar += amount;
+
+		if (readSoFar / 1024 != lastDialogUpdate) {
+			lastDialogUpdate++;
+			String progStr = " "+readSoFar/1024+"/";
+			progStr += (progress.getMaximum()==0) ? "??? KB" : (progress.getMaximum()/1024)+" KB";
+			progress.setValue(readSoFar);
+
+			String cur = currentAction.getText();
+			int i = cur.indexOf(' ');
+			if (i != -1)
+				cur = cur.substring(0, i) + progStr;
+			else
+				cur += progStr;
+			currentAction.setText(cur);
+		}
+	}
+}
Index: c/org/openstreetmap/josm/io/ProgressReader.java
===================================================================
--- /src/org/openstreetmap/josm/io/ProgressReader.java	(revision 114)
+++ 	(revision )
@@ -1,79 +1,0 @@
-package org.openstreetmap.josm.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLConnection;
-
-import javax.swing.BoundedRangeModel;
-import javax.swing.JLabel;
-
-/**
- * Read from an other reader and increment an progress counter while on the way.
- * @author Imi
- */
-public class ProgressReader extends InputStream {
-
-	private final InputStream in;
-	private final BoundedRangeModel progress;
-	private final JLabel currentAction;
-	private int readSoFar = 0;
-	private int lastDialogUpdate = 0;
-	private final URLConnection connection;
-
-	public ProgressReader(URLConnection con, BoundedRangeModel progress, JLabel currentAction) throws IOException {
-		this.connection = con;
-		this.in = con.getInputStream();
-		this.progress = progress;
-		this.currentAction = currentAction;
-		int contentLength = con.getContentLength();
-		if (contentLength > 0)
-			progress.setMaximum(contentLength);
-		else
-			progress.setMaximum(0);
-		progress.setValue(0);
-	}
-
-	@Override public void close() throws IOException {
-		in.close();
-	}
-
-	@Override public int read(byte[] b, int off, int len) throws IOException {
-		int read = in.read(b, off, len);
-		if (read != -1)
-			advanceTicker(read);
-		return read;
-	}
-
-	@Override public int read() throws IOException {
-		int read = in.read();
-		if (read != -1)
-			advanceTicker(1);
-		return read;
-	}
-
-	/**
-	 * Increase ticker (progress counter and displayed text) by the given amount.
-	 * @param amount
-	 */
-	private void advanceTicker(int amount) {
-		if (progress.getMaximum() == 0 && connection.getContentLength() != -1)
-			progress.setMaximum(connection.getContentLength());
-
-		readSoFar += amount;
-
-		if (readSoFar / 1024 != lastDialogUpdate) {
-			lastDialogUpdate++;
-			String progStr = " "+readSoFar/1024+"/";
-			progStr += (progress.getMaximum()==0) ? "??? KB" : (progress.getMaximum()/1024)+" KB";
-			progress.setValue(readSoFar);
-
-			String cur = currentAction.getText();
-			int i = cur.indexOf(' ');
-			if (i != -1)
-				cur = cur.substring(0, i) + progStr;
-			else
-				cur += progStr;
-			currentAction.setText(cur);
-		}
-	}
-}
Index: /src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- /src/org/openstreetmap/josm/tools/I18n.java	(revision 114)
+++ /src/org/openstreetmap/josm/tools/I18n.java	(revision 115)
@@ -20,5 +20,5 @@
 	        i18n = I18nFactory.getI18n(Main.class);
         } catch (MissingResourceException e) {
-        	System.out.println("Locale '"+Locale.getDefault().getLanguage()+"' not found. Using default.");
+        	System.out.println("Locale '"+Locale.getDefault()+"' not found. Using default.");
         }
 	}