Changeset 119 in josm

Timestamp:

2006-07-21T00:31:54+02:00 (18 years ago)

Author:

imi

Message:

• added Annotation Preset Tester
• added Language selection in preferences
• fixed merging bug where incomplete line segments were not replaced

Files:

• images/annotation-tester.png (added)
• po/de.po (modified) (24 diffs)
• po/fr.po (modified) (27 diffs)
• po/org/openstreetmap/josm/Translation_de.class (modified) ( previous)
• po/org/openstreetmap/josm/Translation_fr$1.class (modified) ( previous)
• po/org/openstreetmap/josm/Translation_fr.class (modified) ( previous)
• src/org/openstreetmap/josm/Main.java (modified) (8 diffs)
• src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/PreferenceDialog.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java (added)
• src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/LayerList.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (11 diffs)
• src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/test/MergeVisitorTest.java (modified) (1 diff)

po/de.po

@@ -6 +6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-20 00:42+0200\n"
+"POT-Creation-Date: 2006-07-21 00:28+0200\n"
 "PO-Revision-Date: 2006-07-16 23:44+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -23 +23 @@
 
 #: /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:307
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:326
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -186 +186 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:183
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -298 +298 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:295
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -345 +345 @@
 msgstr "Über dieses Programm"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, fuzzy, java-format
+msgid "Java Version {0}"
+msgstr "Dateiendung unbekannt."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Webseite"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
 msgid "Revision"
 msgstr "Version"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#, fuzzy
+msgid "Contribution"
+msgstr "Auswählen"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
@@ -683 +693 @@
 msgstr "Shift-"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
 #, fuzzy
 msgid "Load Selection"
 msgstr "Auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
 #, java-format
 msgid "Contact {0}..."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
 #, fuzzy
 msgid "Downloading..."
 msgstr "Hole GPS-Daten"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:92
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 msgid "Current Selection"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 msgid "Open a selection list window."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 #, fuzzy
@@ -722 +732 @@
 msgstr "Auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:136
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -728 +738 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
 msgid "Refresh the selection list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
 msgid "Search"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
 msgid "Search for objects."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
 msgid "Please enter a search string."
 msgstr "Bitte geben Sie einen Suchbegriff ein."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -758 +768 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 msgid "remove from selection"
 msgstr ""
@@ -795 +805 @@
 msgstr "Konflikt"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Open a list of all commands (undo buffer)."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
 msgid "Delete the selected layer."
 msgstr ""
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
+msgid "Show/Hide"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
-msgid "Show/Hide"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:81
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Layers"
 msgstr "Ebenen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Open a list of all loaded layers."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Reihe höher schieben"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
 msgid "Move the selected layer one row down."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 #, java-format
 msgid "This will change {0} object."
@@ -843 +853 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
 #, java-format
 msgid ""
@@ -849 +859 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:108
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:107
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
 msgid "Change values?"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:126
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:353
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:351
 msgid "<different>"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 msgid "Please select a key"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 msgid "Please select a value"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Properties"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Property for selected objects."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
 #, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:231
 #, fuzzy, java-format
 msgid "Error parsing {0}: "
 msgstr "Beim speichern ist ein Fehler aufgetreten. {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
 #, java-format
 msgid "Change {0} object"
@@ -893 +903 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "Please select the row to edit."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
 msgid "Please select the row to delete."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:306
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:307
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
 #, java-format
 msgid "Unknown annotation object {0} at line {1} column {2}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:192
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:220
 msgid "Change Properties"
 msgstr ""
@@ -1164 +1174 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Java Open Street Map - Editor"
 msgstr "Java OpenStreetMap - Editor "
@@ -1172 +1182 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:52
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "There are unsaved changes. Really quit?"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
 msgid "Unsaved Changes"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
 #, fuzzy
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap - Editor "
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "usage"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "options"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Show this help"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Download the bounding box"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Select with the given search"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Don't launch in fullscreen mode"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Set the language. Example: "
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "examples"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -1247 +1257 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:131
-#, java-format
-msgid "Cannot open preferences directory: {0}"
 msgstr ""
 
@@ -1358 +1363 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:61
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
 msgid "OptionPane.okButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:99
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
 msgid "OptionPane.cancelButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
 msgid "Draw large GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:166
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:236
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 #, fuzzy
 msgid "Draw direction hints for all segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:256
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
 msgid "Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:257
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
 msgid "Name"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
 #, fuzzy
 msgid "Choose"
 msgstr "Bereich auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
 msgid "Please select a color."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 #, fuzzy, java-format
 msgid "Choose a color for {0}"
 msgstr "Farbe auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:298
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
 msgid "Annotation preset source"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:345
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:346
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:348
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1454 +1459 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1460 +1465 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1470 +1475 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
 msgid "Add a new annotation preset source to the list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid "Display Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1488 +1493 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
 msgid "Look and Feel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+msgid "Language"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
 msgid "Colors"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
 msgid "Connection Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
 #, 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:380
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
 msgid "Base Server URL"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
 msgid "OSM username (email)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "OSM password"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1524 +1533 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "Map Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Projection method"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
 msgid "Annotation preset sources"
 msgstr ""
@@ -1789 +1798 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:163
 msgid "Files"
 msgstr "Dateien"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:173
 #, fuzzy
 msgid "Connection"
 msgstr "Auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:180
 msgid "Layer"
 msgstr "Ebene"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:194
 msgid "Help"
 msgstr "Hilfe"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:237
 msgid "unnamed"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:275
-#, java-format
-msgid ""
-"Preferences could not be loaded. Write default preference file to \"{0}\"."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:293
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:287
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:349
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:343
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:359
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:353
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -1942 +1945 @@
 
 #, fuzzy
-#~ msgid "Unknown version {0}"
-#~ msgstr "Dateiendung unbekannt."
-
-#, fuzzy
 #~ msgid "upload to: {0}"
 #~ msgstr "Zum OSM speichern"

po/fr.po

@@ -7 +7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-20 00:42+0200\n"
+"POT-Creation-Date: 2006-07-21 00:28+0200\n"
 "PO-Revision-Date: 2006-07-19 16:23+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
@@ -25 +25 @@
 
 #: /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:307
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:326
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -203 +203 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:183
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
 msgid "Preferences"
 msgstr "Préférences"
@@ -317 +317 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:295
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -363 +363 @@
 msgstr "Montrer l'à propos."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:66
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr "dernier changement à {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#, fuzzy, java-format
+msgid "Java Version {0}"
+msgstr "Java OpenStreetMap Editor Version {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Rapports de bug"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Readme"
 msgstr "Lisez-moi"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
 msgid "Revision"
 msgstr "Révision"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#, fuzzy
+msgid "Contribution"
+msgstr "Connexion"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "About JOSM..."
 msgstr "À propos de JOSM..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:93
 msgid "File could not be found."
 msgstr "Impossible de trouver le fichier."
@@ -705 +715 @@
 msgstr "Shift-"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
 msgid "Load Selection"
 msgstr "Charger la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:72
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact de {0}..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:77
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
 msgid "Downloading..."
 msgstr "Téléchargement..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
 #, 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
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
 #, 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
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 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/SelectionListDialog.java:133
 #: /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/SelectionListDialog.java:134
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -749 +759 @@
 "liste."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:144
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
 msgid "Reload"
 msgstr "Recharger"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
 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
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
 msgid "Search"
 msgstr "Chercher"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
 msgid "Search for objects."
 msgstr "Rechercher des objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
 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
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -785 +795 @@
 "·key=foot·associé à n'importe quelle valeur.</ul></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
@@ -822 +832 @@
 msgstr "Résoudre les conflits"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr "Pile de commandes"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:32
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Ouvrir une liste de toutes les commandes (annuler le buffer)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
 msgid "Delete the selected layer."
 msgstr "Supprimer le calque sélectionné."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
 msgid "Show/Hide"
 msgstr "Montrer/Cacher"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:81
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
 msgid "Toggle visible state of the selected layer."
 msgstr "Change la visibilité du calque sélectionné."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Layers"
 msgstr "Calque"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:119
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir une liste de tous les calques chargés."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:192
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque sélectionné un étage au-dessus."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:197
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque sélectionné un étage en-dessous."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:210
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 "Fusionner les calques sélectionnés dans le calque directement en dessous."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 #, java-format
 msgid "This will change {0} object."
@@ -871 +881 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:95
 #, java-format
 msgid ""
@@ -879 +889 @@
 "vide supprime la clé)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:108
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:107
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:126
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:353
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:351
 msgid "<different>"
 msgstr "<différent>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 msgid "Please select a key"
 msgstr "Merci de sélectionner une clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 msgid "Please select a value"
 msgstr "Merci de sélectionner une valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Properties"
 msgstr "Propriétés"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Property for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
 #, fuzzy, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:231
 #, fuzzy, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur pendant le traitement {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -923 +933 @@
 msgstr[1] "Cela changera {0} objets."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:259
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:294
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:292
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "Please select the row to edit."
 msgstr "Sélectionnez l'étage à éditer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
 msgid "Please select the row to delete."
 msgstr "Sélectionner l'étage à supprimer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:303
 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:306
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
 msgid "Edit"
 msgstr "Éditer"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:307
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
 #, java-format
 msgid "Unknown annotation object {0} at line {1} column {2}"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:192
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:220
 #, fuzzy
 msgid "Change Properties"
@@ -1194 +1204 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Java Open Street Map - Editor"
 msgstr "Java Open Street Map - Editor"
@@ -1202 +1212 @@
 msgstr "le calque n'est pas dans la liste."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:52
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:53
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -1208 +1218 @@
 "sur le serveur."
 
-#: /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 "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
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:56
 msgid "Unsaved Changes"
 msgstr "Changements non sauvegardés"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "usage"
 msgstr "usage"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "options"
 msgstr "Options"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Download the bounding box"
 msgstr "Télécharge la zone sélectionnée"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharge l'emplacement donné par l'URL (avec lat=x&lon=y&zoom=z)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr "Ouvrir un fichier (en GPS brut si .gpx ou .csv)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone sélectionnée en GPS brut."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Select with the given search"
 msgstr "Sélectionner les résultats de la recherche."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Don't launch in fullscreen mode"
 msgstr "Ne pas lancer en plein écran"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Set the language. Example: "
 msgstr "Choisir la langue. Exemple : "
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "examples"
 msgstr "exemples"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -1281 +1291 @@
 "sur d'avoir chargé des données avant --selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
-
-#: /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
@@ -1397 +1402 @@
 msgstr "Mot de passe"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:61
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:99
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
 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:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
 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:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:166
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:232
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1432 +1437 @@
 "d'informationsur les lignes."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:236
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
 msgid "Draw larger dots for the GPS points."
 msgstr "Dessine de plus gros points GPS."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid "Draw direction hints for all segments."
 msgstr "Dessine les flèches de direction pour tous les segments."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:256
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
 msgid "Color"
 msgstr "Couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:257
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
 msgid "Name"
 msgstr "Nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
 msgid "Choose"
 msgstr "Choisir"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
 msgid "Please select a color."
 msgstr "Sélectionner une couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 #, 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:298
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
 msgid "Annotation preset source"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
 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:345
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
 msgid "Login name (email) to the OSM account."
 msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:346
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1481 +1486 @@
 "aucun mot de passe."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "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:348
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1502 +1507 @@
 "par une virgule.</html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1510 +1515 @@
 "dessiner des lignes le long de votre chemin."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
 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:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1520 +1525 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
 msgid "Add a new annotation preset source to the list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
 #, fuzzy
 msgid "Delete the selected source from the list."
 msgstr "Supprimer le calque sélectionné."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid "Display Settings"
 msgstr "Réglages d'affichage"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1539 +1544 @@
 msgstr "Divers réglages de l'apparence de tout le programme."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
 msgid "Look and Feel"
 msgstr "Apparence et comportement"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+#, fuzzy
+msgid "Language"
+msgstr "usage"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
 msgid "Colors"
 msgstr "Couleurs"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
 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:380
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
 msgid "OSM username (email)"
 msgstr "Nom d'utilisateur OSM (e-mail)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1577 +1587 @@
 "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:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
@@ -1583 +1593 @@
 "données)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 "Réglages pour la projection de la carte et l'interprétation des données."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
 msgid "Projection method"
 msgstr "Méthode de projection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
 msgid "Annotation preset sources"
 msgstr ""
@@ -1841 +1851 @@
 msgstr[1] "objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:163
 msgid "Files"
 msgstr "Fichiers"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:162
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:173
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:180
 msgid "Layer"
 msgstr "Calque"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:183
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:194
 msgid "Help"
 msgstr "Aide"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:224
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:237
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:275
-#, 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:293
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:287
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1875 +1877 @@
 "utilisé."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:349
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:343
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:359
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:353
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
 msgstr "Ignore le fichier malformé d'URL : \"{0}\""
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Impossible d'ouvrir le répertoire des préférences : {0}"
+
+#~ msgid ""
+#~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
+#~ msgstr ""
+#~ "Les préférences pourraient ne pas être chargées. Écrivez les préférences "
+#~ "par défaut dans \"{0}\"."
 
 #~ msgid ""

src/org/openstreetmap/josm/Main.java

@@ -7 +7 @@
 import java.awt.Rectangle;
 import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -19 +19 @@
 import java.util.regex.Pattern;
 
+import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JMenu;
@@ -46 +47 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.dialogs.AnnotationTester;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -128 +130 @@
                 }
         }
-        
+
         /**
          * Remove the specified layer from the map. If it is the last layer, remove the map as well.
@@ -142 +144 @@
                 main = this;
                 contentPane.add(panel, BorderLayout.CENTER);
+
+                final Action annotationTesterAction = new AbstractAction(){
+                        public void actionPerformed(ActionEvent e) {
+                                String[] args = pref.get("annotation.sources").split(";");
+                                new AnnotationTester(args);
+                        }
+                };
+                annotationTesterAction.putValue(Action.NAME, "Annotation Preset Tester");
+                annotationTesterAction.putValue(Action.SMALL_ICON, ImageProvider.get("annotation-tester"));
 
                 final Action uploadAction = new UploadAction();
@@ -171 +182 @@
                 mainMenu.add(layerMenu);
                 layerMenu.setVisible(false);
-                
+
                 final JMenu editMenu = new JMenu(tr("Edit"));
                 editMenu.setMnemonic('E');
@@ -183 +194 @@
                 final JMenu helpMenu = new JMenu(tr("Help"));
                 helpMenu.setMnemonic('H');
+                helpMenu.add(annotationTesterAction);
+                helpMenu.addSeparator();
                 helpMenu.add(aboutAction);
                 mainMenu.add(helpMenu);
@@ -263 +276 @@
          */
         public static void preConstructorInit(Map<String, Collection<String>> args) {
-                // load preferences
-                String errMsg = null;
                 try {
-                        if (args.containsKey("reset-preferences")) {
-                                Main.pref.resetToDefault();
-                        } else {
-                                Main.pref.load();
-                        }
-                } catch (final IOException e1) {
-                        e1.printStackTrace();
-                        errMsg = tr("Preferences could not be loaded. Write default preference file to \"{0}\".",
-                    pref.getPreferencesDir() + "preferences");
-                        Main.pref.resetToDefault();
-                }
-
-                try {
-                Main.pref.upgrade(Integer.parseInt(AboutAction.version));
-        } catch (NumberFormatException e1) {
-        }
-
-                
-                if (errMsg != null)
-                        JOptionPane.showMessageDialog(null, errMsg);
+                        Main.pref.upgrade(Integer.parseInt(AboutAction.version));
+                } catch (NumberFormatException e1) {
+                }
 
                 try {

src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -70 +70 @@
                         text += " "+tr(v.className)+" "+v.name;
                 } else
-                        text += objects.size()+" "+trn("object","objects",objects.size());
+                        text += " "+objects.size()+" "+trn("object","objects",objects.size());
                 DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL));
                 if (objects.size() == 1)

src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -153 +153 @@
                         }
                 }
-                if (my == null)
+                if (my == null) {
+                        // Add the way and replace any incomplete segments that we already have
                         ds.ways.add(other);
-                else {
+                        for (Segment s : other.segments) {
+                                if (s.incomplete) {
+                                        for (Segment ourSegment : ds.segments) {
+                                                if (ourSegment.id == s.id) {
+                                                        mergedSegments.put(s, ourSegment);
+                                                        break;
+                                                }
+                                        }
+                                }
+                        }
+                } else {
                         mergeCommon(my, other);
                         if (my.modified && !other.modified)
@@ -213 +224 @@
                 t.segments.addAll(newSegments);
             }
-            for (Segment ls : t.segments) {
+            for (Segment ls : t.segments)
                 fixSegment(ls);
-            }
     }
 

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -8 +8 @@
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
@@ -87 +88 @@
                 }
 
-                // very first thing to do is to setup the locale
+                // get the preferences.
+                final File prefDir = new File(Main.pref.getPreferencesDir());
+                if (prefDir.exists() && !prefDir.isDirectory()) {
+                        JOptionPane.showMessageDialog(null, "Cannot open preferences directory: "+Main.pref.getPreferencesDir());
+                        return;
+                }
+                if (!prefDir.exists())
+                        prefDir.mkdirs();
+                try {
+                        if (args.containsKey("reset-preferences")) {
+                                Main.pref.resetToDefault();
+                        } else {
+                                Main.pref.load();
+                        }
+                } catch (final IOException e1) {
+                        e1.printStackTrace();
+                        JOptionPane.showMessageDialog(null, "Preferences could not be loaded. Write default preference file to "+pref.getPreferencesDir()+"preferences");
+                        Main.pref.resetToDefault();
+                }
+
+                // 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();
@@ -98 +119 @@
                                 l = new Locale(s.substring(0,2), s.substring(3,5), s.substring(6));
                         Locale.setDefault(l);
+                } else if (!Main.pref.get("language").equals("")) {
+                        String lang = Main.pref.get("language");
+                        for (Locale l : Locale.getAvailableLocales()) {
+                                if (l.toString().equals(lang)) {
+                                        Locale.setDefault(l);
+                                        break;
+                                }
+                        }
                 }
                 
+                // Locale is set. From now on, tr(), trn() and trc() may be called.
+
                 if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
                         System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+
@@ -127 +158 @@
                 }
 
-                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"));

src/org/openstreetmap/josm/gui/PreferenceDialog.java

@@ -10 +10 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -69 +70 @@
                 public void actionPerformed(ActionEvent e) {
                         Main.pref.put("laf", ((LookAndFeelInfo)lafCombo.getSelectedItem()).getClassName());
+                        Main.pref.put("language", languages.getSelectedItem().toString());
                         Main.pref.put("projection", projectionCombo.getSelectedItem().getClass().getName());
                         Main.pref.put("osm-server.url", osmDataServer.getText());
@@ -94 +96 @@
                                 String name = (String)colors.getValueAt(i, 0);
                                 Color col = (Color)colors.getValueAt(i, 1);
-                                Main.pref.put("color."+tr(name), ColorHelper.color2html(col));
+                                Main.pref.put("color."+name, ColorHelper.color2html(col));
                         }
 
@@ -130 +132 @@
          */
         private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
+        private JComboBox languages = new JComboBox(new Locale[]{Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH});
         /**
          * The main tab panel.
@@ -202 +205 @@
                                 requiresRestart = true;
                         }
+                });
+
+                // language
+                String lang = Main.pref.get("language");
+                for (int i = 0; i < languages.getItemCount(); ++i) {
+                        if (languages.getItemAt(i).toString().equals(lang)) {
+                                languages.setSelectedIndex(i);
+                                break;
+                        }
+                }
+                languages.setRenderer(new DefaultListCellRenderer(){
+                        @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                    return super.getListCellRendererComponent(list, ((Locale)value).getDisplayName(), index, isSelected, cellHasFocus);
+            }
                 });
 
@@ -359 +376 @@
                 display.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
                 display.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
+                display.add(new JLabel(tr("Language")), GBC.std());
+                display.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+                display.add(languages, GBC.eol().fill(GBC.HORIZONTAL));
                 display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0));
                 display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0));

src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -5 +5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.KeyEvent;
 import java.util.Collection;
@@ -30 +29 @@
 
         public CommandStackDialog(final MapFrame mapFrame) {
-                super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), KeyEvent.VK_C);
-                setPreferredSize(new Dimension(320,100));
+                super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), KeyEvent.VK_C, 100);
                 mapFrame.mapView.addLayerChangeListener(new LayerChangeListener(){
                         public void activeLayerChange(Layer oldLayer, Layer newLayer) {}

src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -49 +49 @@
 
         public ConflictDialog() {
-                super(tr("Conflict"), "conflict", tr("Merging conflicts."), KeyEvent.VK_C);
+                super(tr("Conflict"), "conflict", tr("Merging conflicts."), KeyEvent.VK_C, 100);
                 displaylist.setCellRenderer(new OsmPrimitivRenderer());
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

src/org/openstreetmap/josm/gui/dialogs/LayerList.java

@@ -5 +5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -117 +116 @@
          */
         public LayerList(MapFrame mapFrame) {
-                super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), KeyEvent.VK_L);
+                super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), KeyEvent.VK_L, 100);
                 instance = new JList(model);
-                setPreferredSize(new Dimension(320,100));
                 add(new JScrollPane(instance), BorderLayout.CENTER);
                 instance.setBackground(UIManager.getColor("Button.background"));

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridLayout;
@@ -209 +208 @@
          */
         public PropertiesDialog(MapFrame mapFrame) {
-                super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P);
-                setPreferredSize(new Dimension(320,150));
-                
+                super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P, 150);
+
                 Vector<AnnotationPreset> allPresets = new Vector<AnnotationPreset>();
                 String allAnnotations = Main.pref.get("annotation.sources");
@@ -219 +217 @@
                         String source = st.nextToken();
                         try {
-                    if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
-                        in = new URL(source).openStream();
-                    else if (source.startsWith("resource://"))
-                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
-                    else
-                        in = new FileInputStream(source);
-                    allPresets.addAll(AnnotationPreset.readAll(in));
-            } catch (IOException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
-            } catch (SAXException e) {
-                    e.printStackTrace();
-                    JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
-            }
+                                if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
+                                        in = new URL(source).openStream();
+                                else if (source.startsWith("resource://"))
+                                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
+                                else
+                                        in = new FileInputStream(source);
+                                allPresets.addAll(AnnotationPreset.readAll(in));
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("Could not read annotation preset source: {0}",source));
+                        } catch (SAXException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("Error parsing {0}: ", source)+e.getMessage());
+                        }
                 }
                 if (allPresets.size() > 0) {
@@ -256 +254 @@
                                 }
                                 annotationPresets.setSelectedIndex(0);
-            }
+                        }
                 });
 

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -4 +4 @@
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -63 +62 @@
                 private OsmIdReader idReader = new OsmIdReader();
                 public SelectionWebsiteLoader(String urlStr, SearchMode mode) {
-                super(tr("Load Selection"));
-                this.mode = mode;
-                URL u = null;
+                        super(tr("Load Selection"));
+                        this.mode = mode;
+                        URL u = null;
                         try {u = new URL(urlStr);} catch (MalformedURLException e) {}
-            this.url = u;
-        }
+                        this.url = u;
+                }
                 @Override protected void realRun() {
                         currentAction.setText(tr("Contact {0}...", url.getHost()));
                         sel = mode != SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
                         try {
-                        URLConnection con = url.openConnection();
-                        InputStream in = new ProgressInputStream(con, progress, currentAction);
+                                URLConnection con = url.openConnection();
+                                InputStream in = new ProgressInputStream(con, progress, currentAction);
                                 currentAction.setText(tr("Downloading..."));
                                 Map<Long, String> ids = idReader.parseIds(in);
-                        for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
-                                if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
-                                        if (mode == SearchMode.remove)
-                                                sel.remove(osm);
-                                        else
-                                                sel.add(osm);
-                                }
+                                for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+                                        if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
+                                                if (mode == SearchMode.remove)
+                                                        sel.remove(osm);
+                                                else
+                                                        sel.add(osm);
+                                        }
                                 }
-                } catch (IOException e) {
-                        e.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url));
-                } catch (SAXException e) {
-                        e.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url));
-                }
-        }
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url));
+                        } catch (SAXException e) {
+                                e.printStackTrace();
+                                JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url));
+                        }
+                }
                 @Override protected void cancel() {
                         sel = null;
@@ -100 +99 @@
                         if (sel != null)
                                 Main.ds.setSelected(sel);
-        }
-        }
-        
+                }
+        }
+
         /**
          * The selection's list data.
@@ -111 +110 @@
          */
         private JList displaylist = new JList(list);
-        
+
         /**
          * Create a SelectionList dialog.
@@ -117 +116 @@
          */
         public SelectionListDialog(MapFrame mapFrame) {
-                super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), KeyEvent.VK_E);
-                setPreferredSize(new Dimension(320,150));
+                super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), KeyEvent.VK_E, 150);
                 displaylist.setCellRenderer(new OsmPrimitivRenderer());
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -132 +130 @@
 
                 JPanel buttonPanel = new JPanel(new GridLayout(1,2));
-                
+
                 JButton button = new JButton(tr("Select"), ImageProvider.get("mapmode/selection/select"));
                 button.setToolTipText(tr("Set the selected elements on the map to the selected items in the list above."));
@@ -150 +148 @@
                 });
                 buttonPanel.add(button);
-                
+
                 button = new JButton(tr("Search"), ImageProvider.get("dialogs", "search"));
                 button.setToolTipText(tr("Search for objects."));
@@ -164 +162 @@
                                                 "<li><code>-name:Bak</code>  - not 'Bak' in the name.</li>" +
                                                 "<li><code>foot:</code>  - key=foot set to any value." +
-                                                "</ul></html>"));
+                                "</ul></html>"));
 
                                 JRadioButton replace = new JRadioButton(tr("replace selection"), true);
@@ -183 +181 @@
                                         @Override public void selectInitialValue() {
                                                 input.requestFocusInWindow();
-                    }
+                                        }
                                 };
                                 pane.createDialog(Main.parent,tr("Search")).setVisible(true);
@@ -194 +192 @@
                 });
                 buttonPanel.add(button);
-                
+
                 add(buttonPanel, BorderLayout.SOUTH);
                 selectionChanged(Main.ds.getSelected());
@@ -241 +239 @@
                 if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://") || search.startsWith("file:/")) {
                         SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode);
-                if (loader.url != null) {
-                        Main.worker.execute(loader);
-                        loader.pleaseWaitDlg.setVisible(true);
-                        return;
-                }
-            }
-            Collection<OsmPrimitive> sel = Main.ds.getSelected();
-        SearchCompiler.Match matcher = SearchCompiler.compile(search);
-        for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
-                if (mode == SearchMode.replace) {
-                        if (matcher.match(osm))
-                                sel.add(osm);
-                        else
-                                sel.remove(osm);
-                } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm))
-                        sel.add(osm);
-                else if (mode == SearchMode.remove && osm.selected && matcher.match(osm))
-                        sel.remove(osm);
-        }
-            Main.ds.setSelected(sel);
-    }
+                        if (loader.url != null) {
+                                Main.worker.execute(loader);
+                                loader.pleaseWaitDlg.setVisible(true);
+                                return;
+                        }
+                }
+                Collection<OsmPrimitive> sel = Main.ds.getSelected();
+                SearchCompiler.Match matcher = SearchCompiler.compile(search);
+                for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+                        if (mode == SearchMode.replace) {
+                                if (matcher.match(osm))
+                                        sel.add(osm);
+                                else
+                                        sel.remove(osm);
+                        } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm))
+                                sel.add(osm);
+                        else if (mode == SearchMode.remove && osm.selected && matcher.match(osm))
+                                sel.remove(osm);
+                }
+                Main.ds.setSelected(sel);
+        }
 }

src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -44 +45 @@
         public final String prefName;
 
-        public ToggleDialog(String name, String iconName, String tooltip, int shortCut) {
+        public ToggleDialog(String name, String iconName, String tooltip, int shortCut, int preferredHeight) {
                 this.prefName = iconName;
+                setPreferredSize(new Dimension(330,preferredHeight));
                 action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortCut, KeyEvent.ALT_MASK, iconName);
                 setLayout(new BorderLayout());

src/org/openstreetmap/josm/test/MergeVisitorTest.java

@@ -238 +238 @@
                 assertSame("Do not import incomplete segments when merging ways.", s, w.segments.iterator().next());
         }
+
+        /**
+         * When merging an incomplete way over a dataset that contain already all
+         * necessary segments, the way must be completed.
+         */
+        @Bug(117)
+        public void testMergeIncompleteOnExistingDoesNotComplete() {
+                // create a dataset with an segment (as base for the later incomplete way)
+                DataSet ds = new DataSet();
+                Node[] n = createNodes(ds, 2);
+                Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
+                s.id = 23;
+                // create an incomplete way which references the former segment
+                Way w = new Way();
+                Segment incompleteSegment = new Segment(s.id);
+                w.segments.add(incompleteSegment);
+                w.id = 42;
+                // merge both
+                MergeVisitor v = new MergeVisitor(ds);
+                v.visit(w);
+                v.fixReferences();
                 
+                assertTrue(ds.ways.contains(w));
+                assertEquals(1, w.segments.size());
+                assertFalse(w.segments.get(0).incomplete);
+        }
+        
+        /**
+         * Deleted segments should be deleted when merged over unchanged segments.
+         * Deleted segments should also raise an conflict when merged over changed segments. 
+         */
+        //TODO
+
         /**
          * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...