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}\""