Index: po/keys.pot
===================================================================
--- po/keys.pot	(revision 165)
+++ po/keys.pot	(revision 166)
@@ -9,5 +9,5 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-13 22:43+0200\n"
+"POT-Creation-Date: 2006-10-07 17:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18,109 +18,109 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
+#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52
 msgid "Add segment"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
+#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54
 msgid "Add a segment between two nodes."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:391
+#: src/org/openstreetmap/josm/command/DeleteCommand.java:46
+#: src/org/openstreetmap/josm/command/DeleteCommand.java:58
 msgid "Delete"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58
 msgid "Delete nodes, streets or segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152
 msgid "Cannot delete node."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156
 msgid "This object is in use."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173
 msgid "Used by more than two segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178
 msgid "Used by only one segment."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187
 msgid "Wrong direction of segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190
 msgid "Conflicting keys"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196
 msgid "Segments are part of different ways."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
+#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214
 msgid "Delete Node"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
 msgid "Selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
+#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72
 msgid "Select objects by dragging or clicking."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Straight line"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74
+#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73
 msgid "Select objects in a straight line."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52
+#: src/org/openstreetmap/josm/command/MoveCommand.java:122
 msgid "Move"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
+#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54
 msgid "Move around objects that are under the mouse or selected."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
+#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102
 msgid "Cannot move objects outside of the world."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add Way"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61
 msgid "Add a new way to the data."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143
 msgid ""
 "Warning: This way is incomplete. Try to download it, before adding segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 #, java-format
 msgid ""
@@ -133,25 +133,25 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162
 msgid "Add segments from ways"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Do you want to add all other selected segments to the one selected way?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168
 msgid "Add segments to way?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder all line segments?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173
 msgid "Reorder?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 #, java-format
 msgid "Create a new way out of {0} segment?"
@@ -160,98 +160,98 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
+#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232
 msgid "Create new way"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add node"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46
 msgid "Add a new node to the map"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add node into segment"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47
 msgid "Add a node into an existing segment"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83
 msgid "Can not add a node outside of the world."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134
+#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132
 msgid "Add Node into Segment"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
+#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53
 msgid "Reverse Segments"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
+#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26
 msgid "Revert the direction of all selected Segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
+#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39
 msgid "Please select at least one segment."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209
+#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:217
 msgid "Preferences"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21
+#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21
 msgid "Open a preferences page for global settings."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40
+#: src/org/openstreetmap/josm/actions/OpenAction.java:40
 msgid "Open a file."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73
+#: src/org/openstreetmap/josm/actions/OpenAction.java:73
 msgid "CSV Data import for non-GPS data is not implemented yet."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76
+#: src/org/openstreetmap/josm/actions/OpenAction.java:76
 #, java-format
 msgid "Unknown file extension: {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83
+#: src/org/openstreetmap/josm/actions/OpenAction.java:83
 #, java-format
 msgid "Error while parsing {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86
+#: src/org/openstreetmap/josm/actions/OpenAction.java:86
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: src/org/openstreetmap/josm/actions/UndoAction.java:23
 msgid "Undo the last action."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download from OSM"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:87
 msgid "Download map data from the OSM server."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:102
 msgid ""
 "Move and zoom the image like the main map. Select an area to download by "
@@ -259,152 +259,152 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:105
 msgid "Bounding box"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:106
 msgid "min lat"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:108
 msgid "min lon"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:110
 msgid "max lat"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:112
 msgid "max lon"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:122
 msgid "Download the following data:"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:129
 msgid "URL from www.openstreetmap.org"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:182
 msgid "Bookmarks"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:198
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:365
+#: src/org/openstreetmap/josm/command/AddCommand.java:52
 msgid "Add"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:203
 msgid "Please enter the desired coordinates first."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:206
 msgid "Please enter a name for the location."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:214
 msgid "Remove"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:219
 msgid "Select a bookmark first."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:238
 msgid "Choose an area"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:261
 msgid "Please enter the desired coordinates or click on a bookmark."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263
+#: src/org/openstreetmap/josm/actions/DownloadAction.java:263
 msgid "Please select at least one download data type."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18
+#: src/org/openstreetmap/josm/actions/ExitAction.java:18
 msgid "Exit the application."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "About"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57
+#: src/org/openstreetmap/josm/actions/AboutAction.java:57
 msgid "Display the about screen."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67
+#: src/org/openstreetmap/josm/actions/AboutAction.java:67
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#: src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "last change at {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
+#: src/org/openstreetmap/josm/actions/AboutAction.java:69
 #, java-format
 msgid "Java Version {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
+#: src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72
+#: src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74
+#: src/org/openstreetmap/josm/actions/AboutAction.java:74
 msgid "News about JOSM"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
+#: src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25
 msgid "Info"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80
+#: src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85
+#: src/org/openstreetmap/josm/actions/AboutAction.java:85
 msgid "About JOSM..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95
+#: src/org/openstreetmap/josm/actions/AboutAction.java:95
 msgid "File could not be found."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:25
 msgid "No document open so nothing to save."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "The document contains no data. Save anyway?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28
 msgid "Empty document"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -412,104 +412,104 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32
 msgid "Conflicts"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "File exists. Overwrite?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
+#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79
 msgid "Overwrite"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31
 msgid "layer"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:141
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: src/org/openstreetmap/josm/data/Preferences.java:141
 msgid "conflict"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:40
 #, java-format
 msgid "Auto Scale: {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43
+#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:41
 #, java-format
 msgid "Auto zoom the view (to {0}. Disabled if the view is moved)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
+#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload to OSM"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:36
+msgid "Upload all changes to the OSM server."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:41
+msgid "Nothing to upload. Get some data first."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:46
+msgid "There are unresolved conflicts. You have to resolve these first."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:75
+msgid "Uploading data"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:97
+msgid "No changes to upload."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:106
+msgid "Objects to add:"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:114
+msgid "Objects to modify:"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:122
+msgid "Objects to delete:"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/UploadAction.java:129
+msgid "Upload this changes?"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25
 msgid "OSM Server Files (.osm .xml)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "GPX Files (.gpx)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 msgid "CSV Files (.csv .txt)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload to OSM"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36
-msgid "Upload all changes to the OSM server."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41
-msgid "Nothing to upload. Get some data first."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46
-msgid "There are unresolved conflicts. You have to resolve these first."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75
-msgid "Uploading data"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97
-msgid "No changes to upload."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106
-msgid "Objects to add:"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114
-msgid "Objects to modify:"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122
-msgid "Objects to delete:"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129
-msgid "Upload this changes?"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: src/org/openstreetmap/josm/actions/RedoAction.java:23
 msgid "Redo the last undone action."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46
 #, java-format
 msgid "Downloading {0} segment"
@@ -518,83 +518,53 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
+msgid "No data imported."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
+msgid "Data Layer"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
 msgid "Download incomplete objects"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82
 msgid "Download all (selected) incomplete ways from the OSM server."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66
-msgid "Please select an incomplete way."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
-#, java-format
-msgid "Download {0} incomplete ways?"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
+#, java-format
+msgid "Download {0} ways containing a total of {1} segments?"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100
 msgid "Download?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save as"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28
-msgid "Save the current data to a new file."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
-msgid "Raw GPS data"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
-msgid "Downloading GPS data"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
-msgid "OpenStreetMap data"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
-msgid "Downloading data"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39
-msgid "No data imported."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76
-msgid "Data Layer"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
-#, java-format
-msgid "Executing {0}"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
-msgid "The Tool requires some data to be loaded."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
-#, java-format
-msgid "Could not execute command: {0}"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
-msgid "Tools"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
-msgid "Could not read external tool configuration."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40
+#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+msgid "Save"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/SaveAction.java:31
+msgid "Save the current data."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/SaveAction.java:58
+msgid "CSV output not supported yet."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/SaveAction.java:61
+msgid "Unknown file extension."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/SaveAction.java:67
+msgid "An error occoured while saving."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:40
 msgid ""
 "Note: GPL is not compatible to the OSM license. Do not upload GPL licensed "
@@ -602,122 +572,141 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
 msgid "Export to GPX"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45
 msgid "Export the data to GPX file."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 msgid "Nothing to export. Get some data first."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "gps track description"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81
 msgid "Add author information"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84
 msgid "Real name"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88
 msgid "Email"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:92
 msgid "Copyright (URL)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:96
 msgid "Predefined"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98
 msgid "Copyright year"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106
 msgid "Keywords"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110
 msgid "Export options"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
 #, java-format
 msgid "Error while exporting {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131
 msgid "Error"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185
+#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185
 msgid "Choose a predefined license"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25
+msgid "OpenStreetMap data"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28
+msgid "Downloading data"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23
+msgid "Raw GPS data"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26
+msgid "Downloading GPS data"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302
+#, java-format
+msgid "Executing {0}"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146
+msgid "The Tool requires some data to be loaded."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306
+#, java-format
+msgid "Could not execute command: {0}"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317
+msgid "Tools"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352
+msgid "Could not read external tool configuration."
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69
 msgid "Align Nodes in Circle"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
+#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29
 msgid "Move the selected nodes into a circle."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
+#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39
 msgid "Please select at least four nodes."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
+#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35
+#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56
 msgid "Rename layer"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
+#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44
 msgid "Also rename the file"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
+#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80
 #, java-format
 msgid "Could not rename the file \"{0}\"."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/HelpAction.java:52
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55
-msgid "Help"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31
-msgid "Save the current data."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58
-msgid "CSV output not supported yet."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61
-msgid "Unknown file extension."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67
-msgid "An error occoured while saving."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save as"
+msgstr ""
+
+#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28
+msgid "Save the current data to a new file."
+msgstr ""
+
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #, java-format
 msgid ""
@@ -727,13 +716,13 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occoured.\n"
@@ -743,9 +732,9 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 msgid ""
 "Please send this to josm@eigenheimstrasse.de\n"
@@ -753,5 +742,5 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
+#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83
 msgid ""
 "Please send an email with the following information to josm@eigenheimstrasse."
@@ -759,56 +748,85 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
+#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12
 msgid "Ctrl-"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
+#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:14
 msgid "Alt-"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
+#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:16
 msgid "AltGr-"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
+#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:18
 msgid "Shift-"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63
 msgid "Load Selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70
 #, java-format
 msgid "Contact {0}..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75
 msgid "Downloading..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Current Selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113
 msgid "Open a selection list window."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
+msgid "Select"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
+msgid "Reload"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+msgid "Refresh the selection list."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180
+msgid "Search"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
+msgid "Search for objects."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Please enter a search string."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -819,143 +837,86 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 msgid "replace selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "add to selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155
+#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "remove from selection"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172
-msgid "Search"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Conflict"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
 msgid "Merging conflicts."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "Resolve"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
-msgid "Select"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
-msgid ""
-"Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106
 msgid "Please select something from the conflict list."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Resolve Conflicts"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
-msgid "Click Reload to refresh list"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83
-msgid "Reload"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
-msgid "Revert"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "History"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-msgid "Display the history of all selected items."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225
-msgid "Object"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
-msgid "Date"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180
-msgid "Not implemented yet."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138
-msgid ""
-"Revert the state of all currently selected objects to the version selected "
-"in the history list."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Command Stack"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 msgid "Open a list of all commands (undo buffer)."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58
 msgid "Delete the selected layer."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79
 msgid "Show/Hide"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Layers"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118
 msgid "Open a list of all loaded layers."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190
 msgid "Move the selected layer one row up."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195
 msgid "Move the selected layer one row down."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216
+#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208
 msgid "Merge the selected layer into the layer directly below."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 #, java-format
 msgid "This will change {0} object."
@@ -964,5 +925,5 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102
 #, java-format
 msgid ""
@@ -970,46 +931,46 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178
 msgid "Change values?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
 msgid "<different>"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
 msgid "Please select objects for which you want to change properties."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "Please select a key"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
 msgid "Please select a value"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Properties"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222
 msgid "Property for selected objects."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
 #, java-format
 msgid "Could not read annotation preset source: {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263
 #, java-format
 msgid "Change {0} object"
@@ -1018,78 +979,86 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Key"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81
 msgid "Value"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:380
 msgid "Please select the row to edit."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:395
 msgid "Please select the row to delete."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:376
+#: src/org/openstreetmap/josm/Main.java:218
 msgid "Edit"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
-#, java-format
-msgid "Unknown type at line {0}"
-msgstr ""
-
-#: /sol/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 ""
-
-#: /sol/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 ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
-msgid "element"
-msgid_plural "elements"
-msgstr[0] ""
-msgstr[1] ""
-
-#: /sol/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 ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
-msgid "Change Properties"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82
+msgid "Click Reload to refresh list"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84
+msgid "Revert"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "History"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+msgid "Display the history of all selected items."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+#: src/org/openstreetmap/josm/gui/MapStatus.java:224
+msgid "Object"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96
+msgid "Date"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178
+msgid "Not implemented yet."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137
+msgid ""
+"Revert the state of all currently selected objects to the version selected "
+"in the history list."
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66
+#: src/org/openstreetmap/josm/data/Preferences.java:135
+#: src/org/openstreetmap/josm/command/MoveCommand.java:122
 msgid "node"
 msgid_plural "nodes"
@@ -1097,7 +1066,7 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: src/org/openstreetmap/josm/data/Preferences.java:136
 msgid "segment"
 msgid_plural "segments"
@@ -1105,7 +1074,7 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92
+#: src/org/openstreetmap/josm/data/Preferences.java:137
 msgid "way"
 msgid_plural "ways"
@@ -1113,23 +1082,23 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "There were conflicts during import."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
+#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321
 #, java-format
 msgid " ({0} deleted.)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57
 msgid "Convert to data layer"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "track"
 msgid_plural "tracks"
@@ -1137,5 +1106,5 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgid "point"
 msgid_plural "points"
@@ -1143,5 +1112,5 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #, java-format
 msgid "a track with {0} point"
@@ -1150,5 +1119,5 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1157,5 +1126,5 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} point"
@@ -1164,106 +1133,106 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 msgid "Customize line drawing"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Use global settings."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211
 msgid "Select line drawing options"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222
 msgid "Customize Color"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "OK"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25
 msgid "Cancel"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227
 msgid "Default"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228
 msgid "Choose a color"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 msgid "Import images"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
+#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349
 msgid "JPEG images (*.jpg)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90
 #, java-format
 msgid "Images for {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95
 msgid "Read GPS..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114
 msgid "No images with readable timestamps found."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
 #, java-format
 msgid "Reading {0}..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191
 msgid "Geotagged Images"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272
 #, java-format
 msgid "current delta: {0}s"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273
 msgid "timezone difference: "
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 msgid "image"
 msgid_plural "images"
@@ -1271,130 +1240,130 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 msgid "Sync clock"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
 msgid "Image"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408
 msgid "GPS unit timezome (difference to photo)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
 msgid "Syncronize Time with GPS Unit"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
+#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434
 msgid "Time entered could not be parsed."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74
+#: src/org/openstreetmap/josm/gui/BookmarkList.java:74
 msgid "Could not read bookmarks."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98
+#: src/org/openstreetmap/josm/gui/BookmarkList.java:98
 msgid "Could not write bookmark."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:123
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: src/org/openstreetmap/josm/gui/MapView.java:123
+#: src/org/openstreetmap/josm/gui/MainApplication.java:172
 msgid "Java Open Street Map - Editor"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:163
+#: src/org/openstreetmap/josm/gui/MapView.java:163
 msgid "layer not in list."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55
+#: src/org/openstreetmap/josm/gui/MainApplication.java:53
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57
+#: src/org/openstreetmap/josm/gui/MainApplication.java:55
 msgid "There are unsaved changes. Really quit?"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58
+#: src/org/openstreetmap/josm/gui/MainApplication.java:56
 msgid "Unsaved Changes"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Java OpenStreetMap Editor"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "usage"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "options"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Show this help"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid "Download the bounding box"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: src/org/openstreetmap/josm/gui/MainApplication.java:152
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
+#: src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
+#: src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Select with the given search"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
+#: src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Don't launch in fullscreen mode"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Set the language. Example: "
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "examples"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
+#: src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -1402,13 +1371,13 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166
+#: src/org/openstreetmap/josm/gui/MainApplication.java:167
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223
+#: src/org/openstreetmap/josm/gui/MapStatus.java:222
 msgid "Lat/Lon"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:232
 #, java-format
 msgid "{0} object has conflicts:"
@@ -1417,49 +1386,49 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "my version:"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "their version:"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247
+#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247
 msgid "resolved version:"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
+#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77
 msgid "Error while parsing"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
+#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80
 msgid "File Not found"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "string"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34
+#: src/org/openstreetmap/josm/gui/MainApplet.java:34
 msgid "Name of the user."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35
+#: src/org/openstreetmap/josm/gui/MainApplet.java:35
 msgid "OSM Password."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "string;string;..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: src/org/openstreetmap/josm/gui/MainApplet.java:37
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
@@ -1467,5 +1436,5 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
@@ -1473,5 +1442,5 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -1479,99 +1448,99 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "any"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40
+#: src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68
+#: src/org/openstreetmap/josm/gui/MainApplet.java:65
+#: src/org/openstreetmap/josm/io/OsmConnection.java:68
 msgid "Username"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71
+#: src/org/openstreetmap/josm/gui/MainApplet.java:68
+#: src/org/openstreetmap/josm/io/OsmConnection.java:71
 msgid "Password"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:125
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:193
 msgid "Draw lines between raw gps points."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:197
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198
 msgid "Draw large GPS points."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:273
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:277
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:278
 msgid "Draw direction hints for all segments."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327
 msgid "Color"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
 msgid "Name"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349
 msgid "Choose"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353
 msgid "Please select a color."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:358
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:382
 msgid "Annotation preset source"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
 msgid "The base URL to the OSM server (REST API)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:408
 msgid "Login name (email) to the OSM account."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:409
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:410
 msgid "The base URL to the server retrieving WMS background pictures from."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:411
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -1583,5 +1552,5 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:418
 msgid ""
 "If your gps device draw to few lines, select this to draw lines along your "
@@ -1589,9 +1558,9 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:419
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:420
 msgid ""
 "The sources (url or filename) of annotation preset definition files. See "
@@ -1599,17 +1568,17 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
 msgid "Add a new annotation preset source to the list."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
 msgid "Display Settings"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -1617,33 +1586,37 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
 msgid "Look and Feel"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431
+msgid "Language"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438
 msgid "Colors"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
 msgid "Connection Settings"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445
 msgid "Connection Settings to the OSM server."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
 msgid "Base Server URL"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:448
 msgid "OSM username (email)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450
 msgid "OSM password"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:452
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -1652,125 +1625,144 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:461
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
 msgid "Map Settings"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467
 msgid "Projection method"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470
 msgid "Annotation preset sources"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486
 msgid "Plugins"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462
+#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486
 msgid "Configure available Plugins."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465
-msgid "Get more plugins"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52
-msgid "Layer"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56
-msgid "Files"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57
-msgid "Connection"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160
+#, java-format
+msgid "Unknown type at line {0}"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178
+#, java-format
+msgid "Cannot have a writable combobox with default values (line {0})"
+msgstr ""
+
+#: 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 ""
+
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185
+msgid "element"
+msgid_plural "elements"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190
+#, java-format
+msgid "Unknown annotation object {0} at line {1} column {2}"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258
+msgid "Change Properties"
+msgstr ""
+
+#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23
 msgid "Contacting the OSM server..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80
-#, java-format
-msgid "Data error: Segment {0} is deleted but part of Way {1}"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115
-#, java-format
-msgid "Data error: Node {0} is deleted but part of Segment {1}"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71
+#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41
+msgid "Conflicts in disjunct objects"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59
+#, java-format
+msgid "Downloading {0} {1}"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66
+msgid "Got more than one object when expecting only one."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:96
+#: src/org/openstreetmap/josm/io/OsmReader.java:98
+msgid "Unknown version"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:114
+msgid "Found <seg> tag on non-way."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:117
+msgid "Incomplete segment with id=0"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:126
+msgid "NullPointerException. Possible some missing tags."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:141
+msgid "Illegal object with id=0"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:149
+#, java-format
+msgid "Couldn''t read time format \"{0}\"."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:164
+#, java-format
+msgid "Missing required attirbute \"{0}\"."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:213
+msgid "Preparing data..."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmReader.java:222
+msgid "Illformed Node id"
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmServerWriter.java:71
 #, java-format
 msgid "Upload {0} {1} ({2})..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185
+#: src/org/openstreetmap/josm/io/OsmServerWriter.java:185
 msgid "Unknown host"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:101
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:103
-msgid "Unknown version"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:119
-msgid "Found <seg> tag on non-way."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:122
-msgid "Incomplete segment with id=0"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:131
-msgid "NullPointerException. Possible some missing tags."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:146
-msgid "Illegal object with id=0"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:154
-#, java-format
-msgid "Couldn''t read time format \"{0}\"."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:169
-#, java-format
-msgid "Missing required attirbute \"{0}\"."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:239
-msgid "Preparing data..."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:249
-msgid "Illformed Node id"
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43
+#: src/org/openstreetmap/josm/io/RawGpsReader.java:43
 #, java-format
 msgid "Data error: lat value \"{0}\" is out of bound."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45
+#: src/org/openstreetmap/josm/io/RawGpsReader.java:45
 #, java-format
 msgid "Data error: lon value \"{0}\" is out of bound."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:39
 msgid "Could not detect data format string."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:62
 msgid ""
 "Format string in data is incomplete or not found. Try setting an manual "
@@ -1778,101 +1770,101 @@
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:63
 msgid ""
 "Format string is incomplete. Need at least 'lat' and 'lon' specification"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:83
 #, java-format
 msgid "Unknown data type: \"{0}\"."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:83
 msgid "Maybe add an format string in preferences."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88
+#: src/org/openstreetmap/josm/io/RawCsvReader.java:88
 #, java-format
 msgid "Parsing error in line {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67
+#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
+msgid "Downloading OSM data..."
+msgstr ""
+
+#: src/org/openstreetmap/josm/io/OsmConnection.java:67
 msgid "Incorrect password or username."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
+#: src/org/openstreetmap/josm/io/OsmConnection.java:74
 msgid "Warning: The password is transferred unencrypted."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: src/org/openstreetmap/josm/io/OsmConnection.java:78
 msgid "Save user and password (unencrypted)"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Enter Password"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116
+#: src/org/openstreetmap/josm/io/OsmConnection.java:116
 msgid "Aborting..."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#, java-format
-msgid "Downloading points {0} to {1}..."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89
-msgid "Downloading OSM data..."
-msgstr ""
-
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34
+#: src/org/openstreetmap/josm/io/OsmIdReader.java:34
 msgid "Error during parse."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
+#: src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19
 msgid "position"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
+#: src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33
 msgid "different"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
+#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14
 msgid "deleted"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "true"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
+#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18
 msgid "false"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
+#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21
 msgid "none"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
+#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25
 msgid "segments"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
+#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19
 msgid "to"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
+#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19
 msgid "from"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "new"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48
 msgid "unknown"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87
 #, java-format
 msgid "{0} node"
@@ -1881,52 +1873,52 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
+#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
 msgid "incomplete"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134
+#: src/org/openstreetmap/josm/data/Preferences.java:134
 msgid "background"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138
+#: src/org/openstreetmap/josm/data/Preferences.java:138
 msgid "incomplete way"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
+#: src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "selected"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:140
+#: src/org/openstreetmap/josm/data/Preferences.java:140
 msgid "gps point"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:142
+#: src/org/openstreetmap/josm/data/Preferences.java:142
 msgid "scale"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#: src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37
+#: src/org/openstreetmap/josm/command/ChangeCommand.java:37
 msgid "Change"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51
+#: src/org/openstreetmap/josm/command/SequenceCommand.java:51
 msgid "Sequence"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Remove \"{0}\" for"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
+#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66
 #, java-format
 msgid "Set {0}={1} for"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
+#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -1934,33 +1926,57 @@
 msgstr[1] ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17
+#: src/org/openstreetmap/josm/plugins/PluginException.java:17
 #, java-format
 msgid "An error occoured in plugin {0}"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:201
+#: src/org/openstreetmap/josm/Main.java:176
+msgid "You have to specify annotation sources in the preferences first."
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:183
+msgid "Annotation Preset Tester"
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:195
+msgid "Files"
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:206
+msgid "Connection"
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:213
+msgid "Layer"
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:234
+msgid "Help"
+msgstr ""
+
+#: src/org/openstreetmap/josm/Main.java:267
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204
+#: src/org/openstreetmap/josm/Main.java:270
 #, java-format
 msgid "Could not load plugin {0}."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:228
+#: src/org/openstreetmap/josm/Main.java:293
 msgid "unnamed"
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:271
+#: src/org/openstreetmap/josm/Main.java:343
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:329
+#: src/org/openstreetmap/josm/Main.java:401
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr ""
 
-#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341
+#: src/org/openstreetmap/josm/Main.java:413
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""