Index: /po/de.po
===================================================================
--- /po/de.po	(revision 115)
+++ /po/de.po	(revision 116)
@@ -6,5 +6,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-19 01:26+0200\n"
+"POT-Creation-Date: 2006-07-20 00:42+0200\n"
 "PO-Revision-Date: 2006-07-16 23:44+0200\n"
 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
@@ -23,5 +23,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/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/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -185,5 +186,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:172
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:183
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -297,5 +298,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /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/command/AddCommand.java:52
 msgid "Add"
@@ -335,48 +337,48 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "Über"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 msgid "Homepage"
 msgstr "Webseite"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Bug Reports"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Revision"
 msgstr "Version"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:91
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
@@ -405,5 +407,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 #, fuzzy
 msgid "conflict"
@@ -833,6 +835,6 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
 #, java-format
 msgid "This will change {0} object."
@@ -841,5 +843,5 @@
 msgstr[1] ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
 #, java-format
 msgid ""
@@ -847,69 +849,98 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:101
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+#: /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
 msgid "Change values?"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:119
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: /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
 msgid "<different>"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
 msgid "Please select a key"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
 msgid "Please select a value"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
 msgid "Properties"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
 msgid "Property for selected objects."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#, java-format
+msgid "Could not read annotation preset source: {0}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#, 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
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
 #: /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:240
+#: /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
 msgid "Please select the row to edit."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
+#: /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
 msgid "Please select the row to delete."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:306
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:309
 #: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:306
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:307
 msgid "Delete the selected key in all objects"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:132
+#, 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
+msgid "Change Properties"
 msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
 msgid "node"
@@ -920,5 +951,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
 #, fuzzy
 msgid "segment"
@@ -929,5 +960,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "way"
 msgid_plural "ways"
@@ -1327,86 +1358,91 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:61
 msgid "OptionPane.okButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:90
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:99
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:110
 msgid "OptionPane.cancelButtonText"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:165
 msgid "Draw large GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:161
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:166
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:221
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:232
 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:225
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:236
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:226
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
 #, fuzzy
 msgid "Draw direction hints for all segments."
 msgstr "Falsche Richtung der Abschnitte."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:241
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:256
 msgid "Color"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:242
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:257
 msgid "Name"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
 #, fuzzy
 msgid "Choose"
 msgstr "Bereich auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
 msgid "Please select a color."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:272
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
 #, fuzzy, java-format
 msgid "Choose a color for {0}"
 msgstr "Farbe auswählen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:298
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
+msgid "Annotation preset source"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:345
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:281
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:346
 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:282
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:283
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:348
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1418,5 +1454,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:290
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1424,13 +1460,27 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:291
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+msgid ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+msgid "Add a new annotation preset source to the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
 msgid "Display Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1438,34 +1488,34 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:297
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
 msgid "Look and Feel"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:304
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid "Colors"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Connection Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 #, 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:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Base Server URL"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:314
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
 msgid "OSM username (email)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:316
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:384
 msgid "OSM password"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:318
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1474,18 +1524,22 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Map Settings"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:333
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
 msgid "Projection method"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
+msgid "Annotation preset sources"
 msgstr ""
 
@@ -1684,20 +1738,24 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
 #, fuzzy
 msgid "background"
 msgstr "Hintergrund anzeigen"
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
+msgid "incomplete way"
+msgstr ""
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
-msgid "incomplete way"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
 #, fuzzy
 msgid "selected"
 msgstr "Löschen"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
 msgid "gps point"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "scale"
 msgstr ""
 
@@ -1752,5 +1810,5 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:275
 #, java-format
 msgid ""
@@ -1758,14 +1816,14 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:285
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:293
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:349
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:359
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
Index: /po/fr.po
===================================================================
--- /po/fr.po	(revision 115)
+++ /po/fr.po	(revision 116)
@@ -7,6 +7,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-19 01:28+0200\n"
-"PO-Revision-Date: 2006-07-18 20:27+0200\n"
+"POT-Creation-Date: 2006-07-20 00:42+0200\n"
+"PO-Revision-Date: 2006-07-19 16:23+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
 "Language-Team: French <josm-fr@eigenheimstrasse.de>\n"
@@ -18,12 +18,13 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:51
 msgid "Add segment"
-msgstr "Ajouter un segment"
+msgstr "Ajouter un segment."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:53
 msgid "Add a segment between two nodes."
-msgstr "Ajouter un segment entre deux noeuds"
+msgstr "Ajouter un segment entre deux noeuds."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/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/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -33,29 +34,29 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:57
 msgid "Delete nodes, streets or segments."
-msgstr "Supprimer les noeuds, les rues ou les segments"
+msgstr "Supprimer des noeuds, des rues ou des segments."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:149
 msgid "Cannot delete node."
-msgstr "Impossible de supprimer le noeud"
+msgstr "Impossible de supprimer le noeud."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:153
 msgid "This object is in use."
-msgstr "Cet objet est en utilisation"
+msgstr "Cet objet est en utilisation."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:170
 msgid "Used by more than two segments."
-msgstr "Utilisé par plus de deux segments"
+msgstr "Utilisé par plus de deux segments."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:175
 msgid "Used by only one segment."
-msgstr "Utilisé par un seul segment"
+msgstr "Utilisé par un seul segment."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:185
 msgid "Used in a way."
-msgstr "Utilisé pour un chemin"
+msgstr "Utilisé par un chemin."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
 msgid "Wrong direction of segments."
-msgstr "Segments dans la mauvaise direction"
+msgstr "Segments dans la mauvaise direction."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
@@ -84,5 +85,5 @@
 msgid "Select objects by dragging or clicking."
 msgstr ""
-"Sélectionner des objets en cliquant ou en définissant une zone à la souris"
+"Sélectionner des objets en cliquant ou en définissant une zone à la souris."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
@@ -92,5 +93,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects in a straight line."
-msgstr "Sélectionner les objets sur une ligne droite"
+msgstr "Sélectionner des objets sur une ligne droite."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:51
@@ -101,9 +102,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:53
 msgid "Move selected objects around."
-msgstr "Déplacer les objets sélectionnés"
+msgstr "Déplacer les objets sélectionnés."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:98
 msgid "Cannot move objects outside of the world."
-msgstr "Impossible de déplacer les objets en dehors du monde"
+msgstr "Impossible de déplacer des objets en dehors de la Terre."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
@@ -113,5 +114,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add a new way to the data."
-msgstr "Ajouter un nouveau chemin aux données"
+msgstr "Ajouter un nouveau chemin aux données;"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
@@ -132,13 +133,13 @@
 "Do you wish to select all segments belonging to the ways instead?"
 msgstr[0] ""
-"Le chemin {0}·a été sélectionné.\n"
+"{0} chemin a été sélectionné.\n"
 "Souhaitez-vous plutôt sélectionner tous les segments appartenant à ce "
-"chemin ?Les chemins {0}·ont été sélectionnés.\n"
+"chemin ?{0} chemins·ont été sélectionnés.\n"
 "Souhaitez-vous plutôt sélectionner tous les segments appartenant à ces "
 "chemins ?"
 msgstr[1] ""
-"Le chemin {0}·a été sélectionné.\n"
+"{0} chemin a été sélectionné.\n"
 "Souhaitez-vous plutôt sélectionner tous les segments appartenant à ce "
-"chemin ?Les chemins {0}·ont été sélectionnés.\n"
+"chemin ?{0} chemins·ont été sélectionnés.\n"
 "Souhaitez-vous plutôt sélectionner tous les segments appartenant à ces "
 "chemins ?"
@@ -167,9 +168,9 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
-#, fuzzy, java-format
+#, java-format
 msgid "Create a new way out of {0} segment?"
 msgid_plural "Create a new way out of {0} segments?"
-msgstr[0] "Créer un nouveau chemin hors de {0} segments ?"
-msgstr[1] "Créer un nouveau chemin hors de {0} segments ?"
+msgstr[0] "Créer un nouveau chemin constitué de {0} segment ?"
+msgstr[1] "Créer un nouveau chemin constitué de {0} segments ?"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
@@ -195,5 +196,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
 msgid "Can not add a node outside of the world."
-msgstr "Impossible d'ajouter un noeud en dehors du monde"
+msgstr "Impossible d'ajouter un noeud en dehors de la Terre."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
@@ -202,5 +203,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:172
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:183
 msgid "Preferences"
 msgstr "Préférences"
@@ -208,5 +209,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
 msgid "Open a preferences page for global settings."
-msgstr "Ouvrir la page des préférences pour les réglages généraux"
+msgstr "Ouvrir la page des préférences pour les réglages généraux."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
@@ -227,5 +228,5 @@
 #, java-format
 msgid "Unknown file extension: {0}"
-msgstr "Extension de fichier inconnue"
+msgstr "Extension de fichier inconnue : {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:79
@@ -244,5 +245,5 @@
 #, java-format
 msgid "Could not read \"{0}\""
-msgstr "Impossible de lire \"{°}\""
+msgstr "Impossible de lire \"{0}\""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
@@ -252,5 +253,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
-msgstr "Annuler la dernière action"
+msgstr "Annuler la dernière action."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
@@ -297,5 +298,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:146
 msgid "min lon"
-msgstr "long min"
+msgstr "lon min"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:148
@@ -305,9 +306,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:150
 msgid "max lon"
-msgstr "long max"
+msgstr "lon max"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:162
 msgid "URL from www.openstreetmap.org"
-msgstr "URL depuis www.openstreetmap.org"
+msgstr "URL à partir de www.openstreetmap.org"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:215
@@ -316,5 +317,6 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /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/command/AddCommand.java:52
 msgid "Add"
@@ -323,9 +325,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:237
 msgid "Please enter the desired coordinates first."
-msgstr "Entrez les coordonnées désirées en premier"
+msgstr "Entrez les coordonnées désirées en premier."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:240
 msgid "Please enter a name for the location."
-msgstr "Entrez un nom pour cet emplacement"
+msgstr "Entrez un nom pour cet emplacement."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:248
@@ -335,5 +337,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:253
 msgid "Select a bookmark first."
-msgstr "Sélectionner un marque-page en premier"
+msgstr "Sélectionner un marque-page en premier."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:271
@@ -343,5 +345,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:286
 msgid "Please enter the desired coordinates or click on a bookmark."
-msgstr "Entrez les coordonnées désirées ou cliquez sur un marque-page"
+msgstr "Entrez les coordonnées désirées ou cliquez sur un marque-page."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
@@ -351,52 +353,52 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
-msgstr "Quitter l'application"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+msgstr "Quitter l'application."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr "À propos"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:40
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
-msgstr "Montrer l'à propos"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:58
+msgstr "Montrer l'à propos."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "last change at {0}"
 msgstr "dernier changement à {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:60
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Bug Reports"
 msgstr "Rapports de bug"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr "Info"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
 msgid "Readme"
 msgstr "Lisez-moi"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
 msgid "Revision"
 msgstr "Révision"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "About JOSM..."
 msgstr "À propos de JOSM..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:91
 msgid "File could not be found."
-msgstr "Impossible de trouver le fichier"
+msgstr "Impossible de trouver le fichier."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
@@ -421,5 +423,5 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "conflict"
 msgstr "conflit"
@@ -442,5 +444,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
 msgid "Upload all changes to the OSM server."
-msgstr "Charger tous les segments sur le serveur d'OSM"
+msgstr "Charger tous les changements sur le serveur d'OSM."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
@@ -455,21 +457,21 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
 msgid "Uploading data"
-msgstr "Charger les données"
+msgstr "Chargement des données"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "No changes to upload."
-msgstr "Aucuns changements à charger"
+msgstr "Aucuns changements à charger."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:108
 msgid "Objects to add:"
-msgstr "Objets à ajouter :"
+msgstr "Objets à ajouter : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Objects to modify:"
-msgstr "Objets à modifier :"
+msgstr "Objets à modifier : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:124
 msgid "Objects to delete:"
-msgstr "Objets à supprimer :"
+msgstr "Objets à supprimer : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:131
@@ -498,9 +500,9 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading {0} segments"
 msgid_plural "Downloading {0} segment"
 msgstr[0] "Télchargement de {0} segments"
-msgstr[1] "Télchargement de {0} segments"
+msgstr[1] "Télchargement de {0} segment"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:85
@@ -532,9 +534,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
 msgid "Not implemented yet."
-msgstr "Pas encore implémenté"
+msgstr "Pas encore implémenté."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
 msgid "Save"
-msgstr "Souvegarder"
+msgstr "Sauvegarder"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:32
@@ -544,5 +546,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:37
 msgid "No document open so nothing to save."
-msgstr "Aucun document ouvert donc rien à sauvegarder"
+msgstr "Aucun document ouvert donc rien à sauvegarder."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:40
@@ -568,9 +570,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:73
 msgid "CSV output not supported yet."
-msgstr "Sortie en CSV pas encore supportée"
+msgstr "Sortie en CSV pas encore supportée."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:76
 msgid "Unknown file extension."
-msgstr "Extension de fichier inconnue"
+msgstr "Extension de fichier inconnue."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:81
@@ -592,9 +594,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid "Export the data to GPX file."
-msgstr "Exporter les données en un fichier GPX"
+msgstr "Exporter les données en un fichier GPX."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
-msgstr "Rien à exporter.Obtenez d'abord des données"
+msgstr "Rien à exporter.Obtenez d'abord des données."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
@@ -810,5 +812,5 @@
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
-"Ouvrir une une fenêtre de fusion des éléments sélectionnés de cette liste"
+"Ouvrir une une fenêtre de fusion des éléments sélectionnés de cette liste."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
@@ -830,5 +832,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:59
 msgid "Delete the selected layer."
-msgstr "Supprimer le calque sélectionné"
+msgstr "Supprimer le calque sélectionné."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
@@ -861,13 +863,13 @@
 "Fusionner les calques sélectionnés dans le calque directement en dessous."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
-#, fuzzy, java-format
+#: /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
+#, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change {0} objects."
-msgstr[0] "Cela changera {0} objets."
+msgstr[0] "Cela changera {0} objet."
 msgstr[1] "Cela changera {0} objets."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:89
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
 #, java-format
 msgid ""
@@ -877,93 +879,120 @@
 "vide supprime la clé)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:101
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
+#: /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
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:119
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:299
+#: /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
 msgid "<different>"
 msgstr "<différent>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
 msgid "Please select a key"
 msgstr "Merci de sélectionner une clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
 msgid "Please select a value"
 msgstr "Merci de sélectionner une valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
 msgid "Properties"
 msgstr "Propriétés"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
 msgid "Property for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#, 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
+#, 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
+#, fuzzy, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Cela changera {0} objet."
+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/ConflictResolver.java:81
 msgid "Key"
 msgstr "Clé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:261
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Valeur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
+#: /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
 msgid "Please select the row to edit."
 msgstr "Sélectionnez l'étage à éditer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245
+#: /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
 msgid "Please select the row to delete."
 msgstr "Sélectionner l'étage à supprimer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter un nouveau couple clé/valeur à tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/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
 msgid "Edit"
 msgstr "Éditer"
 
-#: /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:306
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:307
 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
+#, 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
+#, fuzzy
+msgid "Change Properties"
+msgstr "Propriétés"
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy
 msgid "node"
 msgid_plural "nodes"
 msgstr[0] "noeud"
-msgstr[1] "noeud"
+msgstr[1] "noeuds"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:154
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
-#, fuzzy
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:133
 msgid "segment"
 msgid_plural "segments"
 msgstr[0] "segment"
-msgstr[1] "segment"
+msgstr[1] "segments"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:155
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#, fuzzy
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "way"
 msgid_plural "ways"
-msgstr[0] "chemint"
-msgstr[1] "chemint"
+msgstr[0] "chemin"
+msgstr[1] "chemins"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
@@ -986,22 +1015,20 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
-#, fuzzy
 msgid "track"
 msgid_plural "tracks"
 msgstr[0] "trace"
-msgstr[1] "trace"
+msgstr[1] "traces"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139
-#, fuzzy
 msgid "point"
 msgid_plural "points"
 msgstr[0] "point"
-msgstr[1] "point"
+msgstr[1] "points"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "a track with {0} point"
 msgid_plural "a track with {0} points"
-msgstr[0] "une trace avec {0} points"
+msgstr[0] "une trace avec {0} point"
 msgstr[1] "une trace avec {0} points"
 
@@ -1012,9 +1039,9 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165
-#, fuzzy, java-format
+#, java-format
 msgid "{0} point"
 msgid_plural "{0} points"
-msgstr[0] "point {0}"
-msgstr[1] "point {0}"
+msgstr[0] "{0} point"
+msgstr[1] "{0} points"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169
@@ -1037,5 +1064,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175
 msgid "Choose a color"
-msgstr "Choisir une couler"
+msgstr "Choisir une couleur"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
@@ -1103,9 +1130,8 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
-#, fuzzy
 msgid "image"
 msgid_plural "images"
 msgstr[0] "image"
-msgstr[1] "image"
+msgstr[1] "images"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
@@ -1134,9 +1160,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Entrez la date montrée (mm/jj/aaaa HH:MM:SS)"
+msgstr "Entrez la date et l'heure montrées (mm/jj/aaaa HH:MM:SS)"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "GPS unit timezome (difference to photo)"
-msgstr "Zone haraire de l'unité GPS (différence avec la photo)"
+msgstr "Zone horaire de l'unité GPS (différence avec la photo)"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
@@ -1161,5 +1187,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:90
 msgid "Could not read bookmarks."
-msgstr "Impossible de lire les marque-pages"
+msgstr "Impossible de lire les marque-pages."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:114
@@ -1170,5 +1196,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Java Open Street Map - Editor"
-msgstr "Java·Open·Street·Map·-·Editor"
+msgstr "Java Open Street Map - Editor"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164
@@ -1191,60 +1217,58 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103
-#, fuzzy
 msgid "Java OpenStreetMap Editor"
-msgstr "Java·Open·Street·Map·-·Editor"
+msgstr "Java OpenStreetMap Editor"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "usage"
-msgstr ""
+msgstr "usage"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106
-#, fuzzy
 msgid "options"
-msgstr "Options d'export"
+msgstr "Options"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Show this help"
-msgstr ""
+msgstr "Montrer cette aide"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Standard unix geometry argument"
-msgstr ""
+msgstr "Argument de géométrie standard UNIX"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the bounding box"
-msgstr ""
+msgstr "Télécharge la zone sélectionnée"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
+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
 msgid "Open file (as raw gps, if .gpx or .csv)"
-msgstr ""
+msgstr "Ouvrir un fichier (en GPS brut si .gpx ou .csv)"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Download the bounding box as raw gps"
-msgstr ""
+msgstr "Télécharger la zone sélectionnée en GPS brut."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Select with the given search"
-msgstr ""
+msgstr "Sélectionner les résultats de la recherche."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Don't launch in fullscreen mode"
-msgstr ""
+msgstr "Ne pas lancer en plein écran"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Reset the preferences to default"
-msgstr ""
+msgstr "Rétablir les préférences par défaut"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "Set the language. Example: "
-msgstr ""
+msgstr "Choisir la langue. Exemple : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "examples"
-msgstr ""
+msgstr "exemples"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123
@@ -1253,8 +1277,11 @@
 "some data before --selection"
 msgstr ""
+"Les paramètres sont lus dans l'ordre dans lequel ils sont spécifiés, soyez "
+"donc\n"
+"sur d'avoir chargé des données avant --selection"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:125
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr ""
+msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:131
@@ -1272,9 +1299,9 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
-#, fuzzy, java-format
+#, java-format
 msgid "{0} object has conflicts:"
 msgid_plural "{0} objects have conflicts:"
-msgstr[0] "{0} objets ont des conflits :"
-msgstr[1] "{0} objets ont des conflits :"
+msgstr[0] "{0} objet est conflictuel : "
+msgstr[1] "{0} objets sont conflictuels :"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
@@ -1284,13 +1311,13 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
-msgstr "leur version :"
+msgstr "version du serveur : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
-msgstr "version résolue :"
+msgstr "version choisie : "
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:42
 msgid "Contacting the OSM server..."
-msgstr "Contact du servuer OSM..."
+msgstr "Contact du serveur OSM..."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:81
@@ -1370,33 +1397,33 @@
 msgstr "Mot de passe"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:59
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:61
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:90
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:99
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:101
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:110
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:155
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
 msgid "Draw lines between raw gps points."
 msgstr "Dessiner des lignes entre les points GPS bruts."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment importé"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:165
 msgid "Draw large GPS points."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:161
+msgstr "Dessiner de gros points GPS."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:166
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:221
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:232
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1405,42 +1432,47 @@
 "d'informationsur les lignes."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:225
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:236
 msgid "Draw larger dots for the GPS points."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:226
+msgstr "Dessine de plus gros points GPS."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:237
 msgid "Draw direction hints for all segments."
 msgstr "Dessine les flèches de direction pour tous les segments."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:241
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:256
 msgid "Color"
 msgstr "Couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:242
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:257
 msgid "Name"
 msgstr "Nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
 msgid "Choose"
 msgstr "Choisir"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:267
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
 msgid "Please select a color."
 msgstr "Sélectionner une couleur"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:272
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:287
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choisir une couleur pour {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:298
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
+msgid "Annotation preset source"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
 msgid "The base URL to the OSM server (REST API)"
 msgstr "L'URL de base du serveur OSM (API)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:345
 msgid "Login name (email) to the OSM account."
-msgstr "Nom d'utilisateur (e-mail) à votre compte OSM."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:281
+msgstr "Nom d'utilisateur (e-mail) de votre compte OSM."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:346
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1449,9 +1481,9 @@
 "aucun mot de passe."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "L'URL du serveur récupérant les images de l'arrière-plan WMS."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:283
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:348
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1470,5 +1502,5 @@
 "par une virgule.</html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:290
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1478,49 +1510,62 @@
 "dessiner des lignes le long de votre chemin."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:291
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
 msgid "Colors used by different objects in JOSM."
 msgstr "Couleurs utilisées par les différents objets de JOSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+msgid ""
+"The sources (url or filename) of annotation preset definition files. See "
+"http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+msgid "Add a new annotation preset source to the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+#, 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
 msgid "Display Settings"
 msgstr "Réglages d'affichage"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:364
 msgid ""
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr ""
-"Divers réglages qui influencent la représentation visuelle de tout le "
-"programme."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:297
+msgstr "Divers réglages de l'apparence de tout le programme."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
 msgid "Look and Feel"
 msgstr "Apparence et comportement"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:304
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid "Colors"
 msgstr "Couleurs"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Connection Settings to the OSM server."
 msgstr "Réglages de connexion au serveur OSM"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:314
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
 msgid "OSM username (email)"
-msgstr "Nom d'utilisateur d'OSM (e-mail)"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:316
+msgstr "Nom d'utilisateur OSM (e-mail)"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:384
 msgid "OSM password"
-msgstr "Mot de passe d'OSM"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:318
+msgstr "Mot de passe OSM"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1532,22 +1577,26 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
-"Spécifications de l'impors CSV (vide : lire depuis la prmière ligne de "
+"Spécifications de l'import CSV (vide : lire depuis la première ligne de "
 "données)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
-"Régléges pour la projection de la carte et l'interprétation des données."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:333
+"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
 msgid "Projection method"
 msgstr "Méthode de projection"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
+msgid "Annotation preset sources"
+msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1666,5 +1715,5 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:70
 msgid "Incorrect password or username."
-msgstr "Mot de passe ou nom d'utilisateur incorrect"
+msgstr "Mot de passe ou nom d'utilisateur incorrect."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
@@ -1682,9 +1731,9 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:124
 msgid "Aborting..."
-msgstr "Échec"
+msgstr "Échec..."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
 msgid "Error during parse."
-msgstr "Erreur pendant l'analyse"
+msgstr "Erreur pendant l'analyse."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
@@ -1733,9 +1782,9 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
-#, fuzzy, java-format
+#, java-format
 msgid "{0} node"
 msgid_plural "{0} nodes"
 msgstr[0] "{0} noeud"
-msgstr[1] "{0} noeud"
+msgstr[1] "{0} noeuds"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
@@ -1743,19 +1792,23 @@
 msgstr "incomplet"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:132
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:131
 msgid "background"
 msgstr "arrière plan"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
 msgid "incomplete way"
 msgstr "chemin incomplet"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
 msgid "selected"
 msgstr "sélectionné"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
 msgid "gps point"
 msgstr "point GPS"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+msgid "scale"
+msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
@@ -1783,9 +1836,8 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
-#, fuzzy
 msgid "object"
 msgid_plural "objects"
 msgstr[0] "objet"
-msgstr[1] "objet"
+msgstr[1] "objets"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:152
@@ -1809,5 +1861,5 @@
 msgstr "sans-nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:275
 #, java-format
 msgid ""
@@ -1817,5 +1869,5 @@
 "défaut dans \"{0}\"."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:285
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:293
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1823,10 +1875,10 @@
 "utilisé."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:349
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:351
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:359
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -1870,37 +1922,49 @@
 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 #~ msgstr ""
-#~ "Java·OpenStreetMap·Editor\n"
+#~ "Java·OpenStreetMap·Editor\n"
 #~ "\n"
 #~ "usage:\n"
-#~ "\tjava·-jar·josm.jar·<option>·<option>·<option>...\n"
+#~ "\tjava·-jar·josm.jar·<option>·<option>·<option>...\n"
 #~ "\n"
 #~ "options:\n"
-#~ "\t--help|-?|-h······························Montre cette aide\n"
-#~ "\t--geometry=widthxheight(+|-)x(+|-)y·······Argument de géométrie "
+#~ "\t--help|-?|-"
+#~ "h······························Montre "
+#~ "cette aide\n"
+#~ "\t--geometry=widthxheight(+|-)x(+|-)"
+#~ "y·······Argument de géométrie "
 #~ "standard d'UNIX\n"
-#~ "\t[--download=]minlat,minlon,maxlat,maxlon··Télécharge la boîte de "
-#~ "coordonnées\n"
-#~ "\t[--download=]<url>························Télécharge ce qui ce situe à "
-#~ "l'URL·(avec·lat=x&lon=y&zoom=z)\n"
-#~ "\t[--download=]<nomdufichier>··················ouvrir un fichier·(en GPS "
-#~ "brut si·.gpx·ou·.csv)\n"
-#~ "\t--downloadgps=minlat,minlon,maxlat,maxlon·Télécharge la boîte de "
-#~ "coordonnées en GPS brut.\n"
-#~ "\t--selection=<texte>················Sélectionne en fonction de l'objet "
-#~ "de recherche\n"
-#~ "\t--no-fullscreen···························Ne pas lancer en mode plein "
-#~ "écran\n"
-#~ "\t--reset-preferences······················ Préférences par défaut\n"
+#~ "\t[--download=]minlat,minlon,maxlat,maxlon··Télécharge la "
+#~ "boîte de coordonnées\n"
+#~ "\t[--download=]"
+#~ "<url>························Télécharge "
+#~ "ce qui ce situe à l'URL·(avec·lat=x&lon=y&zoom=z)\n"
+#~ "\t[--download=]"
+#~ "<nomdufichier>··················ouvrir "
+#~ "un fichier·(en GPS brut si·.gpx·ou·.csv)\n"
+#~ "\t--downloadgps=minlat,minlon,maxlat,maxlon·Télécharge la "
+#~ "boîte de coordonnées en GPS brut.\n"
+#~ "\t--"
+#~ "selection=<texte>················Sélectionne "
+#~ "en fonction de l'objet de recherche\n"
+#~ "\t--no-"
+#~ "fullscreen···························Ne "
+#~ "pas lancer en mode plein écran\n"
+#~ "\t--reset-"
+#~ "preferences······················ "
+#~ "Préférences par défaut\n"
 #~ "\n"
 #~ "examples:\n"
-#~ "\tjava·-jar·josm.jar·track1.gpx·track2.gpx·london.osm\n"
-#~ "\tjava·-jar·josm.jar·http://www.openstreetmap.org/index.html?"
+#~ "\tjava·-jar·josm.jar·track1.gpx·track2.gpx·london."
+#~ "osm\n"
+#~ "\tjava·-jar·josm.jar·http://www.openstreetmap.org/index.html?"
 #~ "lat=43.2&lon=11.1&zoom=13\n"
-#~ "\tjava·-jar·josm.jar·london.osm·--selection=http://www.ostertag.name/osm/"
-#~ "OSM_errors_node-duplicate.xml\n"
-#~ "\tjava·-jar·josm.jar·43.2,11.1,43.4,11.4\n"
+#~ "\tjava·-jar·josm.jar·london.osm·--selection=http://www."
+#~ "ostertag.name/osm/OSM_errors_node-duplicate.xml\n"
+#~ "\tjava·-jar·josm.jar·43.2,11.1,43.4,11.4\n"
 #~ "\n"
-#~ "Les paramètres sont lus dans l'ordre dans lequel ils sont spécifiés, "
-#~ "soyez donc sur d'avoir des données avant --selection\n"
+#~ "Les paramètres sont lus dans l'ordre dans lequel ils sont "
+#~ "spécifiés, soyez donc sur d'avoir des données avant --"
+#~ "selection\n"
 #~ "\n"
-#~ "Au lieu de --download=<bbox>·vous pouvez spécifier·osm://<bbox>\n"
+#~ "Au lieu de --download=<bbox>·vous pouvez spécifier·osm://"
+#~ "<bbox>\n"
Index: /src/org/openstreetmap/josm/Main.java
===================================================================
--- /src/org/openstreetmap/josm/Main.java	(revision 115)
+++ /src/org/openstreetmap/josm/Main.java	(revision 116)
@@ -268,6 +268,7 @@
 			if (args.containsKey("reset-preferences")) {
 				Main.pref.resetToDefault();
-			} else
+			} else {
 				Main.pref.load();
+			}
 		} catch (final IOException e1) {
 			e1.printStackTrace();
@@ -276,4 +277,11 @@
 			Main.pref.resetToDefault();
 		}
+
+		try {
+	        Main.pref.upgrade(Integer.parseInt(AboutAction.version));
+        } catch (NumberFormatException e1) {
+        }
+
+		
 		if (errMsg != null)
 			JOptionPane.showMessageDialog(null, errMsg);
Index: /src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- /src/org/openstreetmap/josm/actions/AboutAction.java	(revision 115)
+++ /src/org/openstreetmap/josm/actions/AboutAction.java	(revision 116)
@@ -37,4 +37,21 @@
 public class AboutAction extends JosmAction {
 
+	public static final String version;
+	
+	private static JTextArea revision;
+	private static String time;
+
+	static {
+		JTextArea revision = loadFile(Main.class.getResource("/REVISION"));
+
+		Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+		Matcher match = versionPattern.matcher(revision.getText());
+		version = match.matches() ? match.group(1) : "UNKNOWN";
+		
+		Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+		match = timePattern.matcher(revision.getText());
+		time = match.matches() ? match.group(1) : "UNKNOWN";
+	}
+	
 	public AboutAction() {
 		super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_A);
@@ -45,14 +62,5 @@
 		
 		JTextArea readme = loadFile(Main.class.getResource("/README"));
-		JTextArea revision = loadFile(Main.class.getResource("/REVISION"));
-		
-		Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-		Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
 
-		Matcher match = versionPattern.matcher(revision.getText());
-		String version = match.matches() ? match.group(1) : "UNKNOWN";
-		match = timePattern.matcher(revision.getText());
-		String time = match.matches() ? match.group(1) : "UNKNOWN";
-		
 		JPanel info = new JPanel(new GridBagLayout());
 		info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eop());
@@ -80,5 +88,5 @@
 	 * @return	An read-only text area with the content of "resource"
 	 */
-	private JTextArea loadFile(URL resource) {
+	private static JTextArea loadFile(URL resource) {
 		JTextArea area = new JTextArea(tr("File could not be found."));
 		area.setEditable(false);
Index: /src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /src/org/openstreetmap/josm/data/Preferences.java	(revision 115)
+++ /src/org/openstreetmap/josm/data/Preferences.java	(revision 116)
@@ -32,12 +32,12 @@
 		void preferenceChanged(String key, String newValue);
 	}
-	
+
 	public final ArrayList<PreferenceChangedListener> listener = new ArrayList<PreferenceChangedListener>();
-	
+
 	/**
 	 * Map the property name to the property object.
 	 */
 	private final SortedMap<String, String> properties = new TreeMap<String, String>();
-	
+
 	/**
 	 * Return the location of the preferences file
@@ -112,5 +112,4 @@
 	}
 
-
 	public void load() throws IOException {
 		properties.clear();
@@ -138,5 +137,11 @@
 		properties.put("color."+marktr("gps point"), ColorHelper.color2html(Color.gray));
 		properties.put("color."+marktr("conflict"), ColorHelper.color2html(Color.gray));
+		properties.put("color."+marktr("scale"), ColorHelper.color2html(Color.white));
 		save();
 	}
+
+	public final void upgrade(int oldVersion) {
+		if (oldVersion > 115) return;
+		properties.put("color.scale", ColorHelper.color2html(Color.white));
+	}
 }
Index: /src/org/openstreetmap/josm/data/projection/Epsg4326.java
===================================================================
--- /src/org/openstreetmap/josm/data/projection/Epsg4326.java	(revision 115)
+++ /src/org/openstreetmap/josm/data/projection/Epsg4326.java	(revision 116)
@@ -26,3 +26,7 @@
         return "epsg4326";
     }
+
+	public double scaleFactor() {
+	    return 1.0/360;
+    }
 }
Index: /src/org/openstreetmap/josm/data/projection/Mercator.java
===================================================================
--- /src/org/openstreetmap/josm/data/projection/Mercator.java	(revision 115)
+++ /src/org/openstreetmap/josm/data/projection/Mercator.java	(revision 116)
@@ -34,3 +34,7 @@
         return "mercator";
     }
+
+	public double scaleFactor() {
+	    return 1/Math.PI/2;
+    }
 }
Index: /src/org/openstreetmap/josm/data/projection/Projection.java
===================================================================
--- /src/org/openstreetmap/josm/data/projection/Projection.java	(revision 115)
+++ /src/org/openstreetmap/josm/data/projection/Projection.java	(revision 116)
@@ -47,3 +47,9 @@
      */
     String getCacheDirectoryName();
+    
+    /**
+     * The factor to multiply with an easting coordinate to get from "easting 
+     * units per pixel" to "meters per pixel"
+     */
+    double scaleFactor();
 }
Index: /src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapScaler.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/MapScaler.java	(revision 116)
@@ -1,9 +1,11 @@
 package org.openstreetmap.josm.gui;
 
-import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.geom.Rectangle2D;
 
 import javax.swing.JComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ColorHelper;
 
 public class MapScaler extends JComponent {
@@ -18,7 +20,7 @@
 
 	@Override public void paint(Graphics g) {
-		double circum = mv.getScale()*100/Math.PI/2*40041455; // circumference of the earth in meter
+		double circum = mv.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
 		String text = circum > 1000 ? (Math.round(circum/100)/10.0)+"km" : Math.round(circum)+"m";
-		g.setColor(Color.white);
+		g.setColor(ColorHelper.html2color(Main.pref.get("color.scale", "#ffffff")));
 		g.drawLine(0, 5, 99, 5);
 		g.drawLine(0, 0, 0, 10);
Index: /src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapView.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/MapView.java	(revision 116)
@@ -98,5 +98,5 @@
 		MapSlider zoomSlider = new MapSlider(this);
 		add(zoomSlider);
-		zoomSlider.setBounds(0,0, 100, 30);
+		zoomSlider.setBounds(3, 0, 114, 30);
 		
 		MapScaler scaler = new MapScaler(this);
Index: /src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 116)
@@ -11,4 +11,5 @@
 import java.awt.event.ActionListener;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Vector;
@@ -19,4 +20,5 @@
 import javax.swing.Box;
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -81,4 +83,11 @@
 			Main.pref.put("draw.segment.direction", directionHint.isSelected());
 
+			if (annotationSources.getModel().getSize() > 0) {
+				StringBuilder sb = new StringBuilder();
+				for (int i = 0; i < annotationSources.getModel().getSize(); ++i)
+					sb.append(";"+annotationSources.getModel().getElementAt(i));
+				Main.pref.put("annotation.sources", sb.toString().substring(1));
+			}
+
 			for (int i = 0; i < colors.getRowCount(); ++i) {
 				String name = (String)colors.getValueAt(i, 0);
@@ -121,8 +130,4 @@
 	private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
 	/**
-	 * Combobox with all projections available
-	 */
-	private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
-	/**
 	 * The main tab panel.
 	 */
@@ -161,4 +166,10 @@
 	private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
 	private JTable colors;
+
+	/**
+	 * Combobox with all projections available
+	 */
+	private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+	private JList annotationSources = new JList(new DefaultListModel());
 
 
@@ -227,4 +238,8 @@
 		directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
 
+		String annos = Main.pref.get("annotation.sources");
+		StringTokenizer st = new StringTokenizer(annos, ";");
+		while (st.hasMoreTokens())
+			((DefaultListModel)annotationSources.getModel()).addElement(st.nextToken());
 
 
@@ -275,4 +290,54 @@
 			}
 		});
+
+		// Annotation source panels
+		JPanel annoButton = new JPanel(new GridBagLayout());
+		JButton addAnno = new JButton(tr("Add"));
+		addAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"));
+				if (source == null)
+					return;
+				((DefaultListModel)annotationSources.getModel()).addElement(source);
+				requiresRestart = true;
+			}
+		});
+		GBC g = GBC.eol().fill(GBC.HORIZONTAL);
+		g.weightx = 0;
+		annoButton.add(addAnno,g);
+
+		JButton editAnno = new JButton(tr("Edit"));
+		editAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (annotationSources.getSelectedIndex() == -1)
+					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit."));
+				else {
+					String source = JOptionPane.showInputDialog(Main.parent, tr("Annotation preset source"), annotationSources.getSelectedValue());
+					if (source == null)
+						return;
+					((DefaultListModel)annotationSources.getModel()).setElementAt(source, annotationSources.getSelectedIndex());
+					requiresRestart = true;
+				}
+			}
+		});
+		annoButton.add(GBC.glue(0, 2), GBC.eol());
+		annoButton.add(editAnno,g);
+
+		JButton deleteAnno = new JButton(tr("Delete"));
+		deleteAnno.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				if (annotationSources.getSelectedIndex() == -1)
+					JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."));
+				else {
+					((DefaultListModel)annotationSources.getModel()).remove(annotationSources.getSelectedIndex());
+					requiresRestart = true;
+				}
+			}
+		});
+		annoButton.add(GBC.glue(0, 2), GBC.eol());
+		annoButton.add(deleteAnno,g);
+		annotationSources.setVisibleRowCount(5);
+
+
 
 		// setting tooltips
@@ -290,4 +355,7 @@
 		drawRawGpsLines.setToolTipText(tr("If your gps device draw to few lines, select this to draw lines along your way."));
 		colors.setToolTipText(tr("Colors used by different objects in JOSM."));
+		annotationSources.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+		addAnno.setToolTipText(tr("Add a new annotation preset source to the list."));
+		deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
 
 		// creating the gui
@@ -333,5 +401,9 @@
 		map.add(new JLabel(tr("Projection method")), GBC.std());
 		map.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-		map.add(projectionCombo, GBC.eol().fill(GBC.HORIZONTAL).insets(0,0,0,5));
+		map.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,0,0,5));
+		map.add(new JLabel(tr("Annotation preset sources")), GBC.eol());
+		map.add(new JScrollPane(annotationSources), GBC.std().fill(GBC.HORIZONTAL).insets(10,0,10,0));
+		map.add(annoButton, GBC.eol());
+
 		map.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 
Index: /src/org/openstreetmap/josm/gui/WorldChooser.java
===================================================================
--- /src/org/openstreetmap/josm/gui/WorldChooser.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/WorldChooser.java	(revision 116)
@@ -77,4 +77,7 @@
             public String getCacheDirectoryName() {
                 throw new UnsupportedOperationException();
+            }
+			public double scaleFactor() {
+	            return 1;
             }
 		};
Index: /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java	(revision 116)
+++ /src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java	(revision 116)
@@ -0,0 +1,194 @@
+package org.openstreetmap.josm.gui.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.tools.GBC;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import uk.co.wilson.xml.MinML2;
+
+
+/**
+ * This class read encapsulate one annotation preset. A class method can
+ * read in all predefined presets, either shipped with JOSM or that are
+ * in the config directory.
+ * 
+ * It is also able to construct dialogs out of preset definitions.
+ */
+public class AnnotationPreset {
+
+	private static interface Item {
+		void addToPanel(JPanel p);
+		void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds);
+	}
+
+	public static class Text implements Item {
+		String key;
+		String label;
+		JTextField value = new JTextField();
+
+		public void addToPanel(JPanel p) {
+			p.add(new JLabel(label), GBC.std().insets(0,0,10,0));
+			p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
+		}
+		public Text(String key, String label, String value) {
+			this.key = key;
+			this.label = label;
+			this.value.setText(value == null ? "" : value);
+		}
+		public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
+			cmds.add(new ChangePropertyCommand(sel, key, value.getText()));
+		}
+	}
+
+	public static class Check implements Item {
+		String key;
+		JCheckBox check = new JCheckBox();
+
+		public void addToPanel(JPanel p) {
+			p.add(check, GBC.eol().fill(GBC.HORIZONTAL));
+		}
+		public Check(String key, String label, boolean check) {
+			this.key = key;
+			this.check.setText(label);
+			this.check.setSelected(check);
+		}
+		public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
+			cmds.add(new ChangePropertyCommand(sel, key, check.isSelected() ? "true" : null));
+		}
+	}
+
+	public static class Label implements Item {
+		String text;
+
+		public void addToPanel(JPanel p) {
+			p.add(new JLabel(text), GBC.eol());
+		}
+		public Label(String text) {
+			this.text = text;
+		}
+		public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
+	}
+
+	public static class Key implements Item {
+		String key;
+		String value;
+
+		public void addToPanel(JPanel p) {}
+		public Key(String key, String value) {
+			this.key = key;
+			this.value = value;
+		}
+		public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
+			cmds.add(new ChangePropertyCommand(sel, key, value != null && !value.equals("") ? value : null));
+		}
+	}
+
+	private static class Parser extends MinML2 {
+		List<AnnotationPreset> data = new LinkedList<AnnotationPreset>();
+		List<Item> current;
+		String currentName;
+		private static int unknownCounter = 1;
+
+		@Override public void startElement(String ns, String lname, String qname, Attributes a) throws SAXException {
+			if (qname.equals("annotations"))
+				return;
+			if (qname.equals("item")) {
+				current = new LinkedList<Item>();
+				currentName = a.getValue("name");
+				if (currentName == null)
+					currentName = "Unnamed Preset #"+(unknownCounter++);
+			} else if (qname.equals("text"))
+				current.add(new Text(a.getValue("key"), a.getValue("label"), a.getValue("default")));
+			else if (qname.equals("check")) {
+				String s = a.getValue("default");
+				boolean check = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+				current.add(new Check(a.getValue("key"), a.getValue("label"), check));
+			} else if (qname.equals("label"))
+				current.add(new Label(a.getValue("label")));
+			else if (qname.equals("key"))
+				current.add(new Key(a.getValue("key"), a.getValue("value")));
+			else
+				throw new SAXException(tr("Unknown annotation object {0} at line {1} column {2}", qname, getLineNumber(), getColumnNumber()));
+		}
+		@Override public void endElement(String ns, String lname, String qname) {
+			if (qname.equals("item"))
+				data.add(new AnnotationPreset(current, currentName));
+		}
+	}
+
+	private List<Item> data;
+	String name;
+
+	public AnnotationPreset(List<Item> data, String name) {
+		this.data = data;
+		this.name = name;
+	}
+
+	/**
+	 * Create an empty annotation preset. This will not have any items and
+	 * will be an empty string as text. createPanel will return null.
+	 * Use this as default item for "do not select anything".
+	 */
+	public AnnotationPreset() {
+		name = "";
+	}
+
+	public static List<AnnotationPreset> readAll(InputStream inStream) throws IOException, SAXException {
+		BufferedReader in = null;
+		try {
+			in = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+			in = new BufferedReader(new InputStreamReader(inStream));
+		}
+		Parser p = new Parser();
+		p.parse(in);
+		return p.data;
+	}
+
+	public JPanel createPanel() {
+		if (data == null)
+			return null;
+		JPanel p = new JPanel(new GridBagLayout());
+		for (Item i : data)
+			i.addToPanel(p);
+		return p;
+	}
+	
+	@Override public String toString() {
+		return name;
+	}
+
+	public Command createCommand(Collection<OsmPrimitive> sel) {
+		List<Command> cmds = new LinkedList<Command>();
+		for (Item i : data)
+			i.addCommands(sel, cmds);
+		if (cmds.size() == 0)
+			return null;
+		else if (cmds.size() == 1)
+			return cmds.get(0);
+		else
+			return new SequenceCommand(tr("Change Properties"), cmds);
+    }
+}
Index: /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 115)
+++ /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 116)
@@ -15,7 +15,12 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -23,4 +28,5 @@
 import java.util.Map.Entry;
 
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -42,4 +48,5 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.xml.sax.SAXException;
 
 /**
@@ -196,4 +203,5 @@
 	 */
 	private final JTable propertyTable = new JTable(data);
+	private JComboBox annotationPresets = new JComboBox();
 
 	/**
@@ -202,6 +210,52 @@
 	public PropertiesDialog(MapFrame mapFrame) {
 		super(tr("Properties"), "propertiesdialog", tr("Property for selected objects."), KeyEvent.VK_P);
-
 		setPreferredSize(new Dimension(320,150));
+		
+		Vector<AnnotationPreset> allPresets = new Vector<AnnotationPreset>();
+		String allAnnotations = Main.pref.get("annotation.sources");
+		StringTokenizer st = new StringTokenizer(allAnnotations, ";");
+		while (st.hasMoreTokens()) {
+			InputStream in = null;
+			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 (allPresets.size() > 0) {
+			allPresets.add(0, new AnnotationPreset());
+			annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
+			add(annotationPresets, BorderLayout.NORTH);
+		}
+		annotationPresets.addActionListener(new ActionListener(){
+			public void actionPerformed(ActionEvent e) {
+				Collection<OsmPrimitive> sel = Main.ds.getSelected();
+				AnnotationPreset preset = (AnnotationPreset)annotationPresets.getSelectedItem();
+				JPanel p = preset.createPanel();
+				if (p == null)
+					return;
+				int answer;
+				if (p.getComponentCount() == 0)
+					answer = JOptionPane.OK_OPTION;
+				else
+					answer = JOptionPane.showConfirmDialog(Main.parent, p, trn("Change {0} object", "Change {0} objects", sel.size(), sel.size()), JOptionPane.OK_CANCEL_OPTION);
+				if (answer == JOptionPane.OK_OPTION) {
+					Main.main.editLayer().add(preset.createCommand(sel));
+					selectionChanged(sel); // update whole table
+				}
+				annotationPresets.setSelectedIndex(0);
+            }
+		});
 
 		data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});