Changeset 133 in josm for po/en_GB.po

Timestamp:

2006-08-15T01:06:04+02:00 (20 years ago)

Author:

imi

Message:

added language romania

File:

• po/en_GB.po (modified) (24 diffs)

po/en_GB.po

@@ -11 +11 @@
 "Project-Id-Version: JOSM SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-25 00:28+0200\n"
+"POT-Creation-Date: 2006-08-15 01:02+0200\n"
 "PO-Revision-Date: 2006-07-22 16:18+0100\n"
 "Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
@@ -29 +29 @@
 
 #: /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:310
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:338
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:343
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
@@ -199 +200 @@
 msgstr "Add Node into Segment"
 
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#, fuzzy
+msgid "Reverse Segments"
+msgstr "segments"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#, fuzzy
+msgid "Revert the direction of all selected Segments."
+msgstr "Wrong direction of segments."
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#, fuzzy
+msgid "Please select at least one segment."
+msgstr "Please select the row to delete."
+
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:187
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Preferences"
 msgstr "Preferences"
@@ -312 +329 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:317
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
@@ -535 +552 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/WmsServerAction.java:19
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:177
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
@@ -707 +726 @@
 msgstr "Shift-"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:64
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr "Load Selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:71
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr "Contact {0}..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:76
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr "Downloading..."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:88
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Could not read from url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:91
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Parsing error in url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Select"
 msgstr "Select"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
 msgid ""
@@ -750 +769 @@
 "Set the selected elements on the map to the selected items in the list above."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:142
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
 msgid "Reload"
 msgstr "Reload"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Refresh the selection list."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
 msgid "Search"
 msgstr "Search"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Search for objects."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -785 +805 @@
 "li><li><code>foot:</code>  - key=foot set to any value.</ul></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr "replace selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr "add to selection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr "remove from selection"
@@ -861 +881 @@
 msgstr "Merge the selected layer into the layer directly below."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:96
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:98
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 #, fuzzy, java-format
 msgid "This will change {0} object."
@@ -869 +889 @@
 msgstr[1] "This will change {0} object."
 
-#: /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:98
 #, java-format
 msgid ""
@@ -876 +896 @@
 "Please select a new value for \"{0}\".<br>(Empty string deletes the key.)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:108
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:110
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:170
 msgid "Change values?"
 msgstr "Change values?"
 
-#: /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:272
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:128
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
 msgid "<different>"
 msgstr "<different>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Properties"
 msgstr "Properties"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 msgid "Property for selected objects."
 msgstr "Properties for selected objects."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:230
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:232
 #, fuzzy, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr "Could not read from url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:235
 #, fuzzy, java-format
 msgid "Error parsing {0}: "
 msgstr "Error while parsing {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:254
 #, fuzzy, java-format
 msgid "Change {0} object"
@@ -920 +940 @@
 msgstr[1] "This will change {0} object."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr "Key"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr "Value"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:297
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
 msgid "Please select the row to edit."
 msgstr "Please select the row to edit."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:302
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:342
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
 msgid "Please select the row to delete."
 msgstr "Please select the row to delete."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:308
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:228
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:193
 msgid "Edit"
 msgstr "Edit"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:312
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:313
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
-#, fuzzy, java-format
-msgid "Unknown type at line {0}"
-msgstr "Unknown file extension: {0}"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
-#, java-format
-msgid "Cannot have a writable combobox with default values (line {0})"
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
-#, java-format
-msgid ""
-"display_values ({0}) and values ({1}) must be of same number of elements."
-msgstr ""
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:81
+msgid "Click Reload to refresh list"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
 #, fuzzy
-msgid "element"
-msgid_plural "elements"
-msgstr[0] "segment"
-msgstr[1] "segment"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:190
-#, 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:260
-#, fuzzy
-msgid "Change Properties"
-msgstr "Properties"
+msgid "Revert"
+msgstr "Remove"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "History"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+msgid "Object"
+msgstr "Object"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:95
+msgid "Date"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:136
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
@@ -1097 +1119 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:333
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG images (*.jpg)"
@@ -1167 +1189 @@
 msgstr "{0} within the track."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:319
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "Sync clock"
 msgstr "Sync clock"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:377
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "The date in file \"{0}\" could not be parsed."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:381
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "There is no EXIF time within the file \"{0}\"."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:385
 msgid "Image"
 msgstr "Image"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:384
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:387
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:390
 msgid "GPS unit timezome (difference to photo)"
 msgstr "GPS unit timezome (difference to photo)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:398
 msgid "Syncronize Time with GPS Unit"
 msgstr "Synchronise Time with GPS Unit"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:411
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:414
 msgid "Time entered could not be parsed."
 msgstr "Time entered could not be parsed."
@@ -1310 +1332 @@
 msgid "Lat/Lon"
 msgstr "Lat/Lon"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
-msgid "Object"
-msgstr "Object"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
@@ -1412 +1430 @@
 msgstr "Password"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:62
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:69
 msgid "OptionPane.okButtonText"
 msgstr "OptionPane.okButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:102
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:109
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:113
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:120
 msgid "OptionPane.cancelButtonText"
 msgstr "OptionPane.cancelButtonText"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:164
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:176
 msgid "Draw lines between raw gps points."
 msgstr "Draw lines between raw gps points."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:168
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:180
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:169
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:181
 msgid "Draw large GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:170
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:182
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -1446 +1464 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:259
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:260
 msgid "Draw direction hints for all segments."
 msgstr "Draw direction hints for all segments."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:274
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279
 msgid "Color"
 msgstr "Colour"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:275
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280
 msgid "Name"
 msgstr "Name"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:301
 msgid "Choose"
 msgstr "Choose"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:300
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
 msgid "Please select a color."
 msgstr "Please select a colour."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:305
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:310
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choose a colour for {0}"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:315
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:320
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:334
 msgid "Annotation preset source"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
 msgid "The base URL to the OSM server (REST API)"
 msgstr "The base URL to the OSM server (REST API)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:360
 msgid "Login name (email) to the OSM account."
 msgstr "Login name (email) to the OSM account."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:356
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -1494 +1512 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:357
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:362
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr "The base URL to the server retrieving WMS background pictures from."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:363
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1514 +1532 @@
 "example: \"lat,lon\" will just read lat/lon values comma seperated.</html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1522 +1540 @@
 "way."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:366
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:371
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:367
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:372
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1532 +1550 @@
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:373
 msgid "Add a new annotation preset source to the list."
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
 #, fuzzy
 msgid "Delete the selected source from the list."
 msgstr "Delete the selected layer."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:379
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1553 +1571 @@
 "program."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:375
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:383
 msgid "Language"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
 msgid "Colors"
 msgstr "Colours"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:392
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
 msgid "Connection Settings to the OSM server."
 msgstr "Connection Settings to the OSM server."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:393
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
 msgid "OSM username (email)"
 msgstr "OSM username (email)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:402
 msgid "OSM password"
 msgstr "OSM password"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:404
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1595 +1613 @@
 "url.<br><b>Do not use a valuable Password.</b></html>"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV import specification (empty: read from first line in data)"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Map Settings"
 msgstr "Map Settings"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:413
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid "Settings for the map projection and data interpretation."
 msgstr "Settings for the map projection and data interpretation."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Projection method"
 msgstr "Projection method"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Annotation preset sources"
 msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, fuzzy, java-format
+msgid "Unknown type at line {0}"
+msgstr "Unknown file extension: {0}"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183
+#, java-format
+msgid ""
+"display_values ({0}) and values ({1}) must be of same number of elements."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+#, fuzzy
+msgid "element"
+msgid_plural "elements"
+msgstr[0] "segment"
+msgstr[1] "segment"
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+#, fuzzy
+msgid "Change Properties"
+msgstr "Properties"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1856 +1908 @@
 msgstr[1] "object"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:165
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:154
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:161
 msgid "Annotation Preset Tester"
 msgstr ""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
-#, fuzzy
-msgid "Please select at least one segment."
-msgstr "Please select the row to delete."
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:192
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:196
-#, fuzzy
-msgid "Reverse Segments"
-msgstr "segments"
-
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:206
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:171
 msgid "Files"
 msgstr "Files"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:216
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:181
 msgid "Connection"
 msgstr "Connection"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:223
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:188
 msgid "Layer"
 msgstr "Layer"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:239
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
 msgid "Help"
 msgstr "Help"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:284
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:249
 msgid "unnamed"
 msgstr "unnamed"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:334
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:299
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr "The projection could not be read from preferences. Using EPSG:4263."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:390
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:355
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignoring malformed url: \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:400
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:365
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""