Index: applications/editors/josm/plugins/lang/de/de.po
===================================================================
--- applications/editors/josm/plugins/lang/de/de.po	(revision 6169)
+++ applications/editors/josm/plugins/lang/de/de.po	(revision 6170)
@@ -8,74 +8,56 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-20 15:10+0100\n"
-"PO-Revision-Date: 2007-12-20 20:18+0100\n"
-"Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
+"POT-Creation-Date: 2007-12-27 00:15+0100\n"
+"PO-Revision-Date: 2007-12-27 09:25+0100\n"
+"Last-Translator: Christof Dallermassl\n"
 "Language-Team:  <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:33
 msgid "Load Selection"
 msgstr "Lade Auswahl"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:40
 #, java-format
 msgid "Contact {0}..."
 msgstr "Verbinde zu {0} ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
 msgid "Downloading..."
 msgstr "Lade Daten ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:57
 #, java-format
 msgid "Could not read from url: \"{0}\""
 msgstr "Konnte nicht von URL \"{0}\" lesen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
+#: ../../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:60
 #, java-format
 msgid "Parsing error in url: \"{0}\""
 msgstr "Kann die URL \"{0}\" nicht parsen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 msgid "Search ..."
 msgstr "Suche ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:30
 msgid "Search for objects."
 msgstr "Suche nach Objekten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 msgid "No data loaded."
 msgstr "Keine Daten geladen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:38
 msgid "Please enter a search string."
 msgstr "Bitte einen Suchbegriff eingeben."
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:40
 msgid ""
 "<html>Fulltext search.<ul><li><code>Baker Street</code>  - 'Baker' and "
@@ -93,168 +75,108 @@
 "html>"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:50
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:56
 msgid "case sensitive"
 msgstr "Groß/Kleinschreibung unterscheiden"
 
-#: ../josm/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
-#: ../trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
-#: ../trunk.old/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "Search"
 msgstr "Suche"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:59
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:242
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:79
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
-#: ../josm/src/org/openstreetmap/josm/command/DeleteCommand.java:49
-#: ../josm/src/org/openstreetmap/josm/command/DeleteCommand.java:61
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:59
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:242
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:79
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
-#: ../trunk/src/org/openstreetmap/josm/command/DeleteCommand.java:49
-#: ../trunk/src/org/openstreetmap/josm/command/DeleteCommand.java:61
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:59
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:241
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
-#: ../trunk.old/src/org/openstreetmap/josm/command/DeleteCommand.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/command/DeleteCommand.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:59
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:242
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:75
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:49
+#: ../../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:404
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
 msgid "Delete nodes or ways."
 msgstr "Lösche Knotenpunkte oder Wege."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:209
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:230
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:209
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:230
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:208
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:229
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:209
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:230
 msgid "Cannot delete: Selection is used by relation"
 msgstr "Kann nicht löschen: Auswahl wird bei einer Relation benutzt."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:279
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:279
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:278
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:279
 msgid "Split way segment"
 msgstr "Weg aufspalten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:284
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:284
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:284
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
 "when deleting a way. Ctrl: delete referring objects."
-msgstr "Anklicken: löschen Shift: Lösche Wegabschnitt. Alt: unbenutze Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte."
-
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgstr ""
+"Anklicken: löschen Shift: Lösche Wegabschnitt. Alt: unbenutze Knotenpunkte "
+"nicht löschen. Strg: Lösche verweisende Objekte."
+
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,',','.')"
 msgstr "Zoomen durch ziehen  (Strg-Hoch,Links,Runter,Rechts,'.','-')"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
 msgid "Zoom in by dragging."
 msgstr "Zoomen durch ziehen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:52
 msgid "Draw"
 msgstr "Zeichne"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:47
 msgid "Draw nodes"
 msgstr "Setze Knotenpunkt"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:115
 msgid "Cannot add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:240
 msgid "Add node"
 msgstr "Knoptenpunkt hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:242
 msgid "Add node into way"
 msgstr "Knotenpunkt in einen Weg einfügen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:247
 msgid "Connect existing way to node"
 msgstr "Verbinde existierenden Weg zum Knotenpunkt"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:249
 msgid "Add a new node to an existing way"
 msgstr "Fügt einen Knotenpunkt in einen bestehenden Weg ein"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:251
 msgid "Add node into way and connect"
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:367
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:367
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:367
 msgid ""
 "Click to add a new node. Ctrl: no node re-use/auto-insert. Shift: no auto-"
@@ -264,35 +186,23 @@
 "Shift: Nicht verbinden. Alt: neuer Weg"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
 msgid "Select"
 msgstr "Auswahl"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
 msgid "Select, move and rotate objects"
 msgstr "Objekte auswählen, verschieben, und drehen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen um Objekete im Rechteck aus zu wählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
 msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
@@ -300,11 +210,9 @@
 "Punkt vereinigen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
 msgid "Release the mouse button to stop rotating."
 msgstr "Um das Drehen zu stoppen, Maustaste. loslassen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
-#: ../trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
 msgid ""
 "Move objects by dragging; Shift to add to selection; Shift-Ctrl to rotate "
@@ -314,156 +222,109 @@
 "oder Auswahl ändern."
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
 msgid "Raw GPS data"
 msgstr "Roh GPS-Daten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:31
 msgid "Downloading data"
 msgstr "Lade Daten aus dem Internet"
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
 msgid "No data imported."
 msgstr "Keine Daten importiert."
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
 msgid "Data Layer"
 msgstr "Daten-Ebene"
 
-#: ../josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
-#: ../trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
-#: ../trunk.old/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:57
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap Daten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
-#: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 msgid "Preferences ..."
 msgstr "Einstellungen..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
-#: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:29
 msgid "Open a preferences page for global settings."
 msgstr "öffnete eine globale Einstellungs-Seite."
 
-#: ../josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
-#: ../trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
+#: ../../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:41
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:43
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:43
 msgid "Open ..."
 msgstr "Öffnen..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:43
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:43
 msgid "Open a file."
 msgstr "Datei öffnen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:66
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:66
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:66
+#: ../waypoints/src/WaypointOpenAction.java:59
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim parsen {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:69
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:69
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:69
+#: ../waypoints/src/WaypointOpenAction.java:63
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:80
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:80
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:80
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:104
 msgid "CSV Data import for non-GPS data is not implemented yet."
 msgstr "CSV Datenimport für nicht GPS-Daten ist noch nicht programmiert."
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:82
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:82
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:82
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:82
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:106
 #, java-format
 msgid "Unknown file extension: {0}"
 msgstr "Dateiendung unbekannt: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/OpenAction.java:96
-#: ../trunk/src/org/openstreetmap/josm/actions/OpenAction.java:96
-#: ../trunk.old/src/org/openstreetmap/josm/actions/OpenAction.java:96
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:96
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:120
 #, java-format
 msgid "Markers from {0}"
 msgstr "Wegpunkte von {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
 msgid "Move the selected nodes into a circle."
 msgstr "Verschieb gewählte Punkte in einen Kreis."
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:40
 msgid "Please select at least four nodes."
 msgstr "Bitte mindestens vier Knotenpunkte auswählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
-#: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
 msgid "Rename layer"
 msgstr "Ebene Umbennen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
-#: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
 msgid "Also rename the file"
 msgstr "Die Datei mit umbennen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
-#: ../trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
 #, java-format
 msgid "Could not rename the file \"{0}\"."
 msgstr "Kann \"{0}\" nicht umbennen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid "Select All"
 msgstr "Alles auswählen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -473,70 +334,46 @@
 "unvöllständige Objekte aus."
 
-#: ../josm/src/org/openstreetmap/josm/actions/ExitAction.java:21
-#: ../trunk/src/org/openstreetmap/josm/actions/ExitAction.java:21
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ExitAction.java:21
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:21
 msgid "Exit"
 msgstr "Beenden"
 
-#: ../josm/src/org/openstreetmap/josm/actions/ExitAction.java:21
-#: ../trunk/src/org/openstreetmap/josm/actions/ExitAction.java:21
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ExitAction.java:21
+#: ../../core/src/org/openstreetmap/josm/actions/ExitAction.java:21
 msgid "Exit the application."
 msgstr "Beende das Programm."
 
-#: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:29
-#: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiere gewählte Objekte in den Speicher."
 
-#: ../josm/src/org/openstreetmap/josm/actions/CopyAction.java:40
-#: ../trunk/src/org/openstreetmap/josm/actions/CopyAction.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CopyAction.java:40
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:40
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum kopieren auswählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../josm/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
-#: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:20
 msgid "Unselect All"
 msgstr "Nichts auswählen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Keine Objekte auswählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split Way"
 msgstr "Weg aufspalten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Weg am gewählten Knotenpunkt aufspalten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:68
 msgid "The current selection cannot be used for splitting."
 msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten genutzt werden."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
 msgid "The selected node is not part of any way."
 msgid_plural "The selected nodes are not part of any way."
@@ -544,7 +381,5 @@
 msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:118
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:118
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:118
 msgid ""
 "There is more than one way using the node(s) you selected. Please select the "
@@ -554,13 +389,9 @@
 "auch den Weg auswählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
 msgid "The selected nodes do not share the same way."
 msgstr "Die gewählten Punkte Teilen sich keinen Weg. "
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -568,7 +399,5 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:216
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:216
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:215
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:216
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -578,119 +407,77 @@
 "Mitte des Weges zu wählen)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
-#: ../trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
 #, java-format
 msgid "Split way {0} into {1} parts"
 msgstr "Teile Weg {0} in {1} Teile"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save as ..."
 msgstr "Speichern unter ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 msgid "Save the current data to a new file."
 msgstr "Speichere die aktuellen Daten in eine neue Datei."
 
-#: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-#: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "OSM Server Files (.osm .xml)"
 msgstr "OSM Server Dateien (.osm .xml)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-#: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 msgid "GPX Files (.gpx .gpx.gz)"
 msgstr "GPX Dateien (.gpx .gpx.gz)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
-#: ../trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
 msgid "CSV Files (.csv .txt)"
 msgstr "CSV Dateien (.csv .txt)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
-#: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
-#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
+#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
 msgid "Join node to way"
 msgstr "Knotenpunkt in den Weg einfügen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
-#: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
-#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
+#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:37
 msgid "Join a node into the nearest way segments"
 msgstr "Fügt einen Knotenpunkt an der kürzesten  Stelle in den Weg ein."
 
-#: ../josm/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
-#: ../trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
-#: ../trunk.old/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
+#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
 msgid "Join Node and Line"
 msgstr "Vereinige Punkt und Linie"
 
-#: ../josm/src/org/openstreetmap/josm/actions/HelpAction.java:55
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:102
-#: ../trunk/src/org/openstreetmap/josm/actions/HelpAction.java:55
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:102
-#: ../trunk.old/src/org/openstreetmap/josm/actions/HelpAction.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:55
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:102
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../josm/src/org/openstreetmap/josm/actions/HelpAction.java:107
-#: ../trunk/src/org/openstreetmap/josm/actions/HelpAction.java:107
-#: ../trunk.old/src/org/openstreetmap/josm/actions/HelpAction.java:107
+#: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:107
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Kann nur die Hilfe Seiten von der JOSM Online Hilfe bearbeiten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:112
 msgid "Align Nodes in Line"
 msgstr "Knotenpunkte in einer Line anordnen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:30
 msgid "Move the selected nodes onto a line."
 msgstr "Gewählte Punkte so verschieben, das sie in einer Reihe liegen. "
 
-#: ../josm/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
-#: ../trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:48
 msgid "Please select at least three nodes."
 msgstr "Bitte mindestens drei Knotenpunkte auswählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
-#: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
-#: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
-#: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:27
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:55
 msgid "Reverse ways"
 msgstr "Richtung des Weges drehen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
-#: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:28
 msgid "Reverse the direction of all selected ways."
 msgstr "Dreht die Richtung aller gewählter Wege um."
 
-#: ../josm/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../trunk.old/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 msgid "Please select at least one way."
 msgstr "Bitte mindestens einen Weg wählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -700,421 +487,285 @@
 "GPL stehen hochladen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export to GPX ..."
 msgstr "Als GPX exportieren ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:54
 msgid "Nothing to export. Get some data first."
 msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:78
 msgid "gps track description"
 msgstr "GPS Track-Beschreibung"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:84
 msgid "Add author information"
 msgstr "Information zum Autor hinzufügen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:87
 msgid "Real name"
 msgstr "Voller Name"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:95
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:99
 msgid "Predefined"
 msgstr "Vordefinert"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:101
 msgid "Copyright year"
 msgstr "Jahr des Copyrights"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:109
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:113
 msgid "Export options"
 msgstr "Export-Einstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
 #, java-format
 msgid "Error while exporting {0}"
 msgstr "Fehler beim exportieren von {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:192
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 msgid "Error"
 msgstr "Fehler"
 
-#: ../josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
-#: ../trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
-#: ../trunk.old/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
+#: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:189
 msgid "Choose a predefined license"
 msgstr "Wähle eine vordefinierte Lizenz"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM ..."
 msgstr "Von OSM-Server herunterladen ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:33
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM Server laden."
 
-#: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:43
-#: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:43
 msgid "Download"
 msgstr "Daten herunterladen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/DownloadAction.java:67
-#: ../trunk/src/org/openstreetmap/josm/actions/DownloadAction.java:67
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DownloadAction.java:67
+#: ../../core/src/org/openstreetmap/josm/actions/DownloadAction.java:67
 msgid "Please select at least one task to download"
 msgstr "Bitte wählen Sie mindestens eine Aufgabe zum herunterladen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:65
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:65
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:65
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:65
 msgid "About"
 msgstr "Über"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:65
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:65
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:65
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:65
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:75
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:75
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:75
 #, java-format
 msgid "Java OpenStreetMap Editor Version {0}"
 msgstr "Java OpenStreetMap Editor Version {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:76
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:76
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:76
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
 #, java-format
 msgid "last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java  Version {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:79
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:81
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:81
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:81
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Bug Reports"
 msgstr "Fehler melden:"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:83
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 msgid "News about JOSM"
 msgstr "Neues über JOSM"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:86
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:86
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:86
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:86
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 msgid "Info"
 msgstr "Info"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:87
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:87
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:88
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:88
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:88
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:88
 msgid "Revision"
 msgstr "Version"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:89
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:89
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:89
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:89
 msgid "Contribution"
 msgstr "Mitwirkung"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:96
-#: ../josm/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:96
-#: ../trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:96
-#: ../trunk.old/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:96
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:29
 msgid "Information"
 msgstr "Information"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:111
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:111
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:111
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:120
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:120
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:120
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:120
 msgid "About JOSM..."
 msgstr "Über JOSM..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/AboutAction.java:157
-#: ../trunk/src/org/openstreetmap/josm/actions/AboutAction.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
 msgid "File could not be found."
 msgstr "Datei wurde nicht gefunden."
 
-#: ../josm/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
-#: ../trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 msgid "Duplicate"
 msgstr "Verdoppeln"
 
-#: ../josm/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by Copy and immediate Paste."
 msgstr "Verdoppelt die Selektion durch Kopieren und sofortiges Einfügen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/PasteAction.java:30
-#: ../josm/src/org/openstreetmap/josm/actions/PasteAction.java:99
-#: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:99
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/PasteAction.java:99
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../trunk/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../trunk.old/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Füge den Inhalt der Zwischenablage ein."
 
-#: ../josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:219
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert bereits. Überschreiben?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../trunk.old/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:219
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
 msgid "data"
 msgstr "Daten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "layer"
 msgstr "Ebene"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "selection"
 msgstr "Auswahl"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "conflict"
 msgstr "Konflikt"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom zu {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom die Ansicht zu {0}"
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt zu dem gezoomt werden kann."
 
-#: ../josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-#: ../trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
-#: ../trunk.old/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
+#: ../../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte zu denen gezoomt werden kann"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:62
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:62
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:62
 msgid "Upload to OSM ..."
 msgstr "Zum OSM-Server hochladen ..."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:62
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:62
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:62
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM Server hochladen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:76
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:76
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:76
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:76
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:84
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:84
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:84
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:84
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:92
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:92
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:92
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:92
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:99
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:99
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:99
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
 msgid "Upload these changes?"
 msgstr "Diese Änderungen hochladen?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:107
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:107
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:107
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Kann nichts hochladen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Es gibt ungelöste Konfilkte, die zuerst bearbeitet werden müssen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum hochladen vorhanden."
 
-#: ../josm/src/org/openstreetmap/josm/actions/UploadAction.java:149
-#: ../trunk/src/org/openstreetmap/josm/actions/UploadAction.java:149
-#: ../trunk.old/src/org/openstreetmap/josm/actions/UploadAction.java:149
+#: ../../core/src/org/openstreetmap/josm/actions/UploadAction.java:149
 msgid "Uploading data"
 msgstr "Sende Daten"
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Merge nodes into one."
 msgstr "Mehrere Knotenpunkte zu einem vereinigen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Punkte zum Vereinigen wählen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1124,22 +775,14 @@
 "wirklich vereint werden?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
 msgid "Merge nodes with different memberships?"
 msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
 msgid "Enter values for all conflicts."
 msgstr "Werte für alle Konflikte eingeben."
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1147,14 +790,10 @@
 "wird."
 
-#: ../josm/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
-#: ../trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
-#: ../trunk.old/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "{0} Knotenpunkte vereinigen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:66
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1164,25 +803,17 @@
 "no layer.\""
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:70
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid "The document contains no data. Save anyway?"
 msgstr "Das Dokument enthält keine Daten. Trotzdem speichern?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1192,103 +823,65 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Could not back up file."
 msgstr "Kann kein Backup der Datei erstellen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
 msgid "CSV output not supported yet."
 msgstr "CSV Ausgabe ist noch nicht möglich."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
-#: ../josm/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
 msgid "An error occurred while restoring backup file."
 msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
 
-#: ../josm/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../josm/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../trunk/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Wiederhole die letzte zurückgenommene Aktion."
 
-#: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 msgid "New"
 msgstr "Neu"
 
-#: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 msgid "Create a new map."
 msgstr "Eine neue Karte erstellen."
 
-#: ../josm/src/org/openstreetmap/josm/actions/NewAction.java:21
-#: ../trunk/src/org/openstreetmap/josm/actions/NewAction.java:21
-#: ../trunk.old/src/org/openstreetmap/josm/actions/NewAction.java:21
+#: ../../core/src/org/openstreetmap/josm/actions/NewAction.java:21
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 msgid "Combine Way"
 msgstr "Weg verbinden"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
 msgid "Combine several ways into one."
 msgstr "Verbindet mehrere Wege zu einem."
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen sie mindestens zwei Wege zum Verbinden."
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -1298,13 +891,9 @@
 "sie wirklich verbunden werden?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
 msgid "Combine ways with different memberships?"
 msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -1314,26 +903,18 @@
 "Sie, daß einige Richtungen gedreht werden?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
 msgid "Change directions?"
 msgstr "Richtung ändern?"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Verbinde {0} Wege"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
 
-#: ../josm/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
-#: ../trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
-#: ../trunk.old/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -1343,49 +924,33 @@
 "gebracht werden)"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveAction.java:26
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveAction.java:26
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
 msgid "Save"
 msgstr "Speichern"
 
-#: ../josm/src/org/openstreetmap/josm/actions/SaveAction.java:26
-#: ../trunk/src/org/openstreetmap/josm/actions/SaveAction.java:26
-#: ../trunk.old/src/org/openstreetmap/josm/actions/SaveAction.java:26
+#: ../../core/src/org/openstreetmap/josm/actions/SaveAction.java:26
 msgid "Save the current data."
 msgstr "Speichere die aktuellen Daten."
 
-#: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
-#: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
-#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
 msgid "Ctrl-"
 msgstr "Strg-"
 
-#: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
-#: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
-#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:17
 msgid "Alt-"
 msgstr "Alt-"
 
-#: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
-#: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
-#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:19
 msgid "AltGr-"
 msgstr "AltGr-"
 
-#: ../josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
-#: ../trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
-#: ../trunk.old/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
+#: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:21
 msgid "Shift-"
 msgstr "Shift-"
 
-#: ../josm/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
-#: ../trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
+#: ../../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:24
 msgid "Do not show again"
 msgstr "Nicht noch einmal zeigen"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 #, java-format
 msgid "An unexpected exception occurred, that may come from in the ''{0}'' plugin."
@@ -1394,26 +959,18 @@
 "könnte."
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:65
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -1423,7 +980,5 @@
 "um das Plugin zu entfernen."
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -1433,19 +988,13 @@
 "Verwaltern Ihres JOSM Pakets."
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 msgid "Do nothing"
 msgstr "Nichts tun"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 msgid "Report Bug"
 msgstr "Fehler melden"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
 msgid ""
 "An unexpected exception occurred.\n"
@@ -1460,13 +1009,9 @@
 "uns den Fehler als \"Bug Report\"."
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:89
 msgid "Unexpected Exception"
 msgstr "Unerwarter Fehler"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:120
 msgid ""
 "Please report a ticket at http://josm.openstreetmap.de/newticket, including "
@@ -1479,25 +1024,17 @@
 "Informationen hinzu:"
 
-#: ../josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
-#: ../trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
-#: ../trunk.old/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
+#: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:126
 msgid "The text has already been copied to your clipboard."
 msgstr "Der Text wurde bereits in Ihre Zwischenablage kopiert."
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:40
 msgid "Update Plugins"
 msgstr "Plugins aktualisieren"
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:50
 #, java-format
 msgid ""
@@ -1510,7 +1047,5 @@
 " {0}"
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:52
 #, java-format
 msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -1519,14 +1054,10 @@
 msgstr[1] "{0} Plugins erfolgreich aktualisiert. Bitte JOSM neu starten."
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 #, java-format
 msgid "Could not download plugin: {0} from {1}"
 msgstr "Kann das Plugin {0} nicht von {1} laden"
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 #, java-format
 msgid "The plugin {0} seem to be broken or could not be downloaded automatically."
@@ -1535,40 +1066,28 @@
 "heruntergeladen werden."
 
-#: ../josm/src/org/openstreetmap/josm/plugins/PluginException.java:18
-#: ../trunk/src/org/openstreetmap/josm/plugins/PluginException.java:18
-#: ../trunk.old/src/org/openstreetmap/josm/plugins/PluginException.java:18
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
 #, java-format
 msgid "An error occoured in plugin {0}"
 msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten."
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:195
 msgid "Unknown type"
 msgstr "Unbekannter Typ"
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:236
 msgid "Error parsing presets.xml: "
 msgstr "Fehler beim Parsen.der Vorlagen-XMLs: "
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:255
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Kann die Tagging Preset Quelle nicht lesen: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:258
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Parsen {0}:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:290
 #, java-format
 msgid "Change {0} object"
@@ -1577,37 +1096,25 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
-#: ../trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
-#: ../trunk.old/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
+#: ../../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:320
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 msgid "Merging conflicts."
 msgstr "Konflikte lösen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:66
 msgid "Resolve"
 msgstr "Lösen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Öffnet ein Dialog-Fenster mit dem gewählten Objekten aus der obigen Liste."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:77
 msgid "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
@@ -1615,76 +1122,50 @@
 "ausgewählten Objekte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
 msgid "Please select something from the conflict list."
 msgstr "Bitte wählen Sie Einträge aus der Konflikte-Liste."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 msgid "Resolve Conflicts"
 msgstr "Konflikte entfernen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:85
 msgid "Click Reload to refresh list"
 msgstr "Auf \"Neu Laden\" klicken um die Liste zu aktualisieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:86
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87
 msgid "Revert"
 msgstr "Rückgängig"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 msgid "History"
 msgstr "Geschichte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:90
 msgid "Display the history of all selected items."
 msgstr "Zeige die Versionen aller gewählten Objekte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 msgid "Object"
 msgstr "Objekt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:100
 msgid "Date"
 msgstr "Datum"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Lade alle gewählten Objekte neu und aktualisiere die Liste."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:140
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:184
 msgid "Not implemented yet."
 msgstr "Noch nicht fertig."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:143
 msgid ""
 "Revert the state of all currently selected objects to the version selected "
@@ -1694,247 +1175,155 @@
 "Versionsliste ausgewählt ist."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:51
 msgid "Open a selection list window."
 msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 msgid "Command Stack"
 msgstr "Befehlsliste"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:29
 msgid "Open a list of all commands (undo buffer)."
 msgstr "Zeige alle bislang ausgeführten (und rückänderbaren) Befehle an."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
 msgid "Edit Relation"
 msgstr "Relation bearbeiten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:136
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:141
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:80
 msgid "Value"
 msgstr "Wert"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 msgid "Role"
 msgstr "Rolle"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
 msgid "Occupied By"
 msgstr "Belegt durch"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (leerer Wert löscht das Tag)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 msgid "Add Selected"
 msgstr "Gewähltes hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
 msgid "Add all currently selected objects as members"
 msgstr "Füge alle gewählten Objekte als Mitglied hinzu"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
 msgid "Remove the member in the current table row from this relation"
 msgstr "Entferne das Mitglied in der aktuelle Tabellenzeile von dieser Relation."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
 msgid "Highlight the member from the current table row as JOSM's selection"
 msgstr "Übernehme das Mitglied der Aktuellen Tabellenzeile als JOSM Auswahl."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
 msgid "Delete the selected layer."
 msgstr "Ausgewählte Ebene löschen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:71
 msgid "Do you really want to delete the whole layer?"
 msgstr "Soll wirklich die gesamte Ebene gelöscht werden?"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
 msgid "Show/Hide"
 msgstr "Zeigen/Verstecken"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:88
 msgid "Toggle visible state of the selected layer."
 msgstr "Schaltet die Ebene zwischen sichtbar und unsichbar um."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
 msgid "Show/Hide Text"
 msgstr "Zeige/Verstecke Text"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
 msgid "Toggle visible state of the marker text."
 msgstr "Schaltet den Merker Text zwischen sichtbar und unsichbar um."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Layers"
 msgstr "Ebenen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Open a list of all loaded layers."
 msgstr "Öffnet eine Liste alle geladenen Ebenen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:233
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Reihe höher schieben"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:239
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Reihe tiefer schieben."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
 msgid "Merge the layer directly below into the selected layer."
 msgstr "Gewählte Ebene in die Ebene direkt darunter integrieren."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
 msgid "Open a list of all relations."
 msgstr "Öffnet eine Liste aller Relationen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 msgid "Add Relation"
 msgstr "Relation hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:71
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:98
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:71
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:98
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:71
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:71
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:98
+#: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:85
 msgid "Open an editor for the selected relation"
 msgstr "Öffne einen Editor für die gewählte Relation"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 msgid "Authors"
 msgstr "Autoren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:49
 msgid "Open a list of people working on the selected objects."
 msgstr ""
@@ -1942,28 +1331,18 @@
 "haben."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 msgid "Author"
 msgstr "Autor"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:51
 msgid "# Objects"
 msgstr "# Objekte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:124
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte für die Einstellungen geändert werden sollen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
 #, java-format
 msgid "This will change {0} object."
@@ -1972,37 +1351,21 @@
 msgstr[1] "Dies wird {0} Objekte ändern."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
 msgid "An empty value deletes the key."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:267
 msgid "Change values?"
 msgstr "Wert ändern?"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:478
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:510
 msgid "<different>"
 msgstr "<verschieden>"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
 #, java-format
 msgid "Change properties of {0} object"
@@ -2011,7 +1374,5 @@
 msgstr[1] "Ändere Einstellungen für {0} Objekte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
 msgid "Please select objects for which you want to change properties."
 msgstr ""
@@ -2019,133 +1380,85 @@
 "sollen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 msgid "Properties/Memberships"
 msgstr "Einstellungen/Mitgliedschaften"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
 msgid "Properties for selected objects."
 msgstr "Einstellungen der ausgewählten Objekte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 msgid "Member Of"
 msgstr "Mitglied von"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:414
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:414
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:414
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:414
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:394
 msgid "Please select the row to edit."
 msgstr "Bitte wählen sie eine Zeile zum bearbeiten."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:419
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:419
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:419
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:419
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:84
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:408
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die zu löschende Zeile."
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:127
-#: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../josm/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:127
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../trunk/src/org/openstreetmap/josm/command/AddCommand.java:67
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:127
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../trunk.old/src/org/openstreetmap/josm/command/AddCommand.java:67
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:127
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:380
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:426
 msgid "Add a new key/value pair to all objects"
 msgstr "Füge ein neues Paar aus Schlüssel und Wert zu allen Objekten hinzu"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:427
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte ändern"
 
-#: ../josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
-#: ../trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
-#: ../trunk.old/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:428
 msgid "Delete the selected key in all objects"
 msgstr "Den Schlüssel aus allen Objekten löschen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:20
 msgid "Keep backup files"
 msgstr "Backupdateien erstellen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:24
 msgid "When saving, keep backup files ending with a ~"
 msgstr "Beim Speichern, behalte eine Sicherheitskopie endend auf ~"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:45
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 msgid "Tagging preset source"
 msgstr "Voreinstellungs-Quelle"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
 msgid ""
 "The sources (url or filename) of tagging preset definition files. See http://"
@@ -2155,74 +1468,51 @@
 "openstreetmap.de/wiki/TaggingPresets für Hilfe."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 msgid "Add a new tagging preset source to the list."
 msgstr "Eine neue Voreinstellungsquelle zu der Liste hinzufügen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:419
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle löschen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 msgid "Tagging Presets"
 msgstr "Tagging Vorlagen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
 msgid "Tagging preset sources"
 msgstr "Voreinstellungs-Quellen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 msgid "Advanced Preferences"
 msgstr "Erweiterte Einstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:35
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Setzt Einstellungseinträge direkt. Bitte vorsichtig benutzen!"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:65
 msgid "Enter a new key/value pair"
 msgstr "Füge ein neues Schlüssel/Wert Paar hinzu."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:119
 #, java-format
 msgid "New value for {0}"
 msgstr "Neuen Wert für {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:107
 msgid "Separator"
 msgstr "Trenner"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:35
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis URL des OSM Servers (REST API)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 msgid "Login name (email) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM Server."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
@@ -2230,25 +1520,17 @@
 "werden soll."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
 msgid "Base Server URL"
 msgstr "Basis Rechner URL"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "OSM username (email)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid "OSM password"
 msgstr "OSM Passwort"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -2260,7 +1542,5 @@
 "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:22
 msgid ""
 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</"
@@ -2279,55 +1559,37 @@
 "ließt einfach die Länge und Breite durch Komma getrennt.</html>"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
 msgid "CSV import specification (empty: read from first line in data)"
 msgstr "CSV import definition (leer: lese aus der ersten Zeile der Daten)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Zeichne Linien zwischen Roh GPS Punkten."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:17
 msgid "Force lines if no segments imported."
 msgstr "Erzwingt Linien, wenn keine Abschnitte importiert werden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:18
 msgid "Draw large GPS points."
 msgstr "Zeiche große GPS Punkte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:19
 msgid "Draw Direction Arrows"
 msgstr "Zeichne Richtungspfeile"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:20
 msgid "Draw segment order numbers"
 msgstr "Segment Ordnungsnummer anzeigen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:21
 msgid "Draw boundaries of downloaded data"
 msgstr "Zeige Grenzen der geladenen Daten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:22
 msgid "Draw inactive layers in other color"
 msgstr "Zeichne inaktive Ebenen in anderer Farbe"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid ""
 "If your gps device draw too few lines, select this to draw lines along your "
@@ -2337,7 +1599,5 @@
 "werden um die Linien entlang des Weges zu vervollständigen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "Force drawing of lines if the imported data contain no line information."
 msgstr ""
@@ -2345,110 +1605,71 @@
 "Informationen enthalten."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw larger dots for the GPS points."
 msgstr "Zeichnet größere Punkte für GPS-Punkte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 msgid "Draw direction hints for all segments."
 msgstr "Zeichne Pfeilrichtung für alle Abschnitte."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zeige die Ordnungsnummer für alle Segmente innerhalb des Weges."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM Server geladenen Bereichs anzeigen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zeichne inaktive Daten-Ebenen in einer anderen Farbe."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:35
 msgid "Map Projection"
 msgstr "Projektionsmethode"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:37
 msgid "Projection method"
 msgstr "Projektionsmethode"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:50
 msgid "Color"
 msgstr "Farbe"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:51
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
 msgid "Name"
 msgstr "Name"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:121
 msgid "Choose"
 msgstr "Wähle"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:125
 msgid "Please select a color."
 msgstr "Bitte eine Farbe wählen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:130
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Eine Farbe für {0} auswählen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben die durch verschieden Objekte in JOSM benutzt werden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 msgid "Colors"
 msgstr "Farben"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147
 msgid "background"
 msgstr "Hintergrund"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
-#: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:62
-#: ../josm/src/org/openstreetmap/josm/command/MoveCommand.java:121
-#: ../josm/src/org/openstreetmap/josm/command/RotateCommand.java:134
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
-#: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:62
-#: ../trunk/src/org/openstreetmap/josm/command/MoveCommand.java:121
-#: ../trunk/src/org/openstreetmap/josm/command/RotateCommand.java:134
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
-#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:62
-#: ../trunk.old/src/org/openstreetmap/josm/command/MoveCommand.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/command/RotateCommand.java:134
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:62
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#: ../../core/src/org/openstreetmap/josm/command/RotateCommand.java:134
 msgid "node"
 msgid_plural "nodes"
@@ -2456,19 +1677,11 @@
 msgstr[1] "Knotenpunkte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
 msgid "segment"
 msgstr "Abschnitt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
-#: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
-#: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:170
-#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:80
 msgid "way"
 msgid_plural "ways"
@@ -2476,49 +1689,33 @@
 msgstr[1] "Wege"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151
 msgid "incomplete way"
 msgstr "unvollständiger Weg"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "selected"
 msgstr "gewählt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 msgid "gps point"
 msgstr "GPS Punkt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:155
 msgid "scale"
 msgstr "Skala"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:156
 msgid "inactive"
 msgstr "Inaktiv"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
 msgid "Configure available plugins."
 msgstr "Bearbeite verfügbare Plugins."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Liste laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -2527,61 +1724,38 @@
 msgstr[1] "Lade Plugin Informationen von {0} Seiten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
 msgid "No plugin information found."
 msgstr "Keine Plugin Informationen gefunden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
 msgid "Update"
 msgstr "Update"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
 msgid "Configure Sites ..."
 msgstr "Seiten Konfigurieren ...."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:120
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:120
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:120
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:120
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 msgid "Add either site-josm.xml or Wiki Pages."
 msgstr "Bitte entwerde site-josm.xml oder Wiki Seiten hinzufügen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Please select an entry."
 msgstr "Bitte wählen Sie einen Eintrag."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
 msgid "Configure Plugin Sites"
 msgstr "Plugin Seiten berarbeiten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
 #, java-format
 msgid ""
@@ -2594,20 +1768,14 @@
 "{0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM verbunden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr "Fehler beim lesen der Plugin Informationsdatei: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
 #, java-format
 msgid ""
@@ -2620,19 +1788,13 @@
 "{0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins holen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -2640,175 +1802,117 @@
 msgstr "Diverse Optionen die die visuelle Repräsentation des Programms beinflussen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Connection Settings for the OSM server."
 msgstr "Verbinungseinstellungen zum OSM Server."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: ../josm/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
-#: ../trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Sie müssen das Programm neu starten damit die Einstellungen sichtbar werden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
 msgid "You can paste an URL here to download the area."
 msgstr "Sie können hier eine URL einfügen um diesen Bereich zu laden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "min lat"
 msgstr "min Breite"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid "min lon"
 msgstr "min Länge"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:125
 msgid "max lat"
 msgstr "max Breite"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:127
 msgid "max lon"
 msgstr "max Länge"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
 msgid "URL from www.openstreetmap.org"
 msgstr "URL von www.openstreetmap.org"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:181
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
+#: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:184
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Bereich okay, Größe ist wahrscheinlich akzeptabel für den Server"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
-#: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:79
 msgid "Data Sources and Types"
 msgstr "Datenquellen und Typen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
-#: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Als neue Ebene laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
-#: ../trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
+#: ../../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:117
 msgid "Download Area"
 msgstr "Bereich laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
-#: ../trunk/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
+#: ../../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:100
 msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 msgstr "Sie können die Maus oder Strg-Pfeiltasten /./ um zu zoomen und zu zielen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
 msgid "Please enter the desired coordinates first."
 msgstr "Bitte wählen Sie zuerst die Koordinaten."
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
 msgid "Please enter a name for the location."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../trunk.old/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
+#: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie ein Lesezeichen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Es gab einen Fehler beim Anzeigen der URL für diesen Merker"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "(URL was: "
 msgstr "(Die URL war:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "Error displaying URL"
 msgstr "Fehler beim Anzeigen der URL"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 msgid "name"
 msgstr "Name"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
 msgid "symbol"
 msgstr "Symbol"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:87
 msgid "There was an error while trying to play the sound file for this marker."
 msgstr "Es gab einen Fehler beim abspielen der Ton-Aufzeichnung für diesen Wegpunkt."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
 msgid "Error playing sound"
 msgstr "Fehler bei der Klang Ausgabe."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
 msgid "marker"
 msgid_plural "markers"
@@ -2816,7 +1920,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -2825,82 +1927,47 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:337
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "OK"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
+#: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:342
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:158
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:158
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:158
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:158
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:343
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:406
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:406
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:406
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:410
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:410
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:410
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -2910,41 +1977,23 @@
 "<br>Wenn Sie die GPX-Tracks hochladen wollen sollten Sie hier schauen:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:411
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:411
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:411
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:93
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:383
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:426
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:383
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:426
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:383
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:426
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertiert von: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:274
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
 msgid "Upload this trace..."
 msgstr "Den Track hochladen ...."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:278
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 msgid ""
 "<html>This functionality has been added only recently. Please<br>use with "
@@ -2954,71 +2003,41 @@
 "prüfen ob es wie erwartet funktioniert.</html>"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:111
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:116
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
 msgid "Upload track filtered by JOSM"
 msgstr "Track durch JOSM gefiltert hochladen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
 #, java-format
 msgid "Upload raw file: {0}"
 msgstr "Rohdaten hochladen {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:307
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:307
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:307
 msgid "Upload raw file: "
 msgstr "Rohdaten hochladen: "
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:302
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:310
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
 msgid "GPX-Upload"
 msgstr "GPX-Upload"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
-#: ../josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
-#: ../trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:195
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
 msgid "track"
 msgid_plural "tracks"
@@ -3026,7 +2045,5 @@
 msgstr[1] "Tracks"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
 msgid "point"
 msgid_plural "points"
@@ -3034,7 +2051,5 @@
 msgstr[1] "Punkte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
 #, java-format
 msgid "a track with {0} point"
@@ -3043,7 +2058,5 @@
 msgstr[1] "Ein Track mit {0} Punkten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #, java-format
 msgid "{0} consists of {1} track"
@@ -3052,7 +2065,5 @@
 msgstr[1] "{0} besteht aus {1} Tracks"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
 #, java-format
 msgid "{0} point"
@@ -3061,151 +2072,99 @@
 msgstr[1] "{0} Punkte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
 msgid "Customize line drawing"
 msgstr "Linien-Aussehen anpassen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
 msgid "Use global settings."
 msgstr "Globale Einstellungen benutzen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
 msgid "Draw lines between points for this layer."
 msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
 msgid "Do not draw lines between points for this layer."
 msgstr "Zeichne keine Linien zwischen Punkten dieser Ebene."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
 msgid "Select line drawing options"
 msgstr "Wähle Linienausehen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:203
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:203
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:191
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:203
 msgid "There were conflicts during import."
 msgstr "Es gab Konflikte beim Importieren."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:305
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:305
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:293
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:305
 #, java-format
 msgid " ({0} deleted.)"
 msgstr "({0} gelöscht.)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:380
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:380
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:373
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:380
 msgid "Convert to GPX layer"
 msgstr "Zur GPX-Ebene konvertieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:96
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder für {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:101
 msgid "Read GPX..."
 msgstr "Lese GPX..."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:110
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Kein Zeit für Punkt {0} x {1}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:115
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kann die Zeit \"{0}\" vom Punkt {1} x {2} nicht lesen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:123
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:134
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lese {0}...."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:201
 msgid "Geotagged Images"
 msgstr "Bilder mit Ortsbezug"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:337
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS start: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Ende: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:340
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Momentaner Unterschied {0}s"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:341
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 msgid "image"
 msgid_plural "images"
@@ -3213,81 +2172,54 @@
 msgstr[1] "Bilder"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:365
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innerhalb des Tracks."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
 msgid "Sync clock"
 msgstr "Uhrzeit Synchornisieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG Bilder (*.jpg)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:463
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Die Datei {0} kann nicht verarbeitet werden."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:467
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Es gibt keine EXIF Zeitinformationen in der Datei {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:471
 msgid "Image"
 msgstr "Bild"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:473
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Datum eingeben (mm/tt/jjjj HH:MM:SS)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:476
 msgid "GPS unit timezome (difference to photo)"
 msgstr "Zeitzone des GPS Geräts (Unterschied zum Foto)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:484
 msgid "Syncronize Time with GPS Unit"
 msgstr "Zeit mit GPS Gerät synchronisieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:500
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "{0} track, "
@@ -3296,6 +2228,5 @@
 msgstr[1] "{0} Tracks"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
 #, java-format
 msgid "{0} route, "
@@ -3304,6 +2235,5 @@
 msgstr[1] "{0} Routen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "{0} waypoint"
@@ -3312,136 +2242,92 @@
 msgstr[1] "{0}Wegpunkte"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:217
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:217
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:217
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschreibung: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:322
-#: ../trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:322
-#: ../trunk.old/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:322
 msgid "Tags (keywords in GPX):"
 msgstr "Tags (Schlüsselworte in GPX):"
 
-#: ../josm/src/org/openstreetmap/josm/gui/BookmarkList.java:43
-#: ../trunk/src/org/openstreetmap/josm/gui/BookmarkList.java:43
-#: ../trunk.old/src/org/openstreetmap/josm/gui/BookmarkList.java:43
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
 msgid "Could not read bookmarks."
 msgstr "Kann Lesezeichen nicht lesen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/BookmarkList.java:57
-#: ../trunk/src/org/openstreetmap/josm/gui/BookmarkList.java:57
-#: ../trunk.old/src/org/openstreetmap/josm/gui/BookmarkList.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
 msgid "Could not write bookmark."
 msgstr "Kann Lesezeichen nicht schreiben."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MapView.java:112
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:169
-#: ../trunk/src/org/openstreetmap/josm/gui/MapView.java:112
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:169
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MapView.java:112
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:112
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Java OpenStreetMap - Editor"
 msgstr "Java OpenStreetMap - Editor"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MapView.java:157
-#: ../trunk/src/org/openstreetmap/josm/gui/MapView.java:157
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MapView.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:157
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:142
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:142
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap - Editor"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:143
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:143
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "usage"
 msgstr "Benutzung"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "options"
 msgstr "Optionen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:146
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:146
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "Show this help"
 msgstr "Zeige diese Hilfe"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:147
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:147
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:131
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:148
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:148
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Download the bounding box"
 msgstr "Lade den Zeichen-Kasten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:149
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:149
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lade den Ort an der URL (mit lat=x&lon=y&zomm=z)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:150
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:150
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Open file (as raw gps, if .gpx or .csv)"
 msgstr "Datei öffnen (als roh GPS, wenn .gpx oder .csv)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:151
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:151
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid "Download the bounding box as raw gps"
 msgstr "Lade den Zeichen-Kasten als Roh-GPS"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:152
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:152
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:152
 msgid "Select with the given search"
 msgstr "Auswählen mit der angegebenen Suche"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:153
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:153
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Don't launch in fullscreen mode"
 msgstr "Nicht im Vollbildmodus starten"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:154
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:154
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Defaultwerte zurücksetzen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:155
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:155
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Set the language. Example: "
 msgstr "Die Sprache Einstellen. Beispiel:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:156
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:156
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:162
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:162
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3452,54 +2338,41 @@
 "selection verwendet wird."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplication.java:164
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplication.java:164
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:97
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:97
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:94
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:97
 msgid "File"
 msgstr "Datei"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:99
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:99
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:96
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:99
+#: ../osmarender/src/OsmarenderPlugin.java:91
+#: ../osmarender/src/OsmarenderPlugin.java:97
 msgid "View"
 msgstr "Anzeigen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:100
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:100
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:100
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:29
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:101
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:101
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainMenu.java:98
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:101
 msgid "Presets"
 msgstr "Vorlagen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainMenu.java:164
-#: ../trunk/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
 msgid "Wireframe view"
 msgstr "Drahtdarstellung"
 
-#: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
-#: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
-#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24
 msgid "Contacting the OSM server..."
 msgstr "Versuche OSM Server zu erreichen..."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MapStatus.java:261
-#: ../trunk/src/org/openstreetmap/josm/gui/MapStatus.java:261
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MapStatus.java:261
+#: ../../core/src/org/openstreetmap/josm/gui/MapStatus.java:261
 msgid "Lat/Lon"
 msgstr "Breite/Länge"
 
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
 #, java-format
 msgid "{0} object has conflicts:"
@@ -3508,36 +2381,25 @@
 msgstr[1] "{0} Objekte haben Konflikte:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
 msgid "my version:"
 msgstr "meine Version:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
 msgid "their version:"
 msgstr "deren Version:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
-#: ../trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
-#: ../trunk.old/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
 msgid "resolved version:"
 msgstr "neue Version:"
 
-#: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
-#: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:87
 msgid "Error while parsing"
 msgstr "Fehler beim Parsen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
-#: ../trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
-#: ../trunk.old/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:90
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:52
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:52
 msgid ""
 "<html><h2>You are running the latest JOSM version with built-in mappaint "
@@ -3552,17 +2414,18 @@
 "see the mini help about modifier keys at the bottom of the screen).</h3>"
 msgstr ""
-"<html><h2>Es läuft die neueste JOSM Version mit eingebauten Mappaint-Unterstützung.</h2> "
-"<h3>Das Mappaint-Plugin ist nicht mehr nötig und wurde aus der Konfigurationsdatei entfernt (wenn<br> "
-"es eingestellt war). Man kann zwischen der \"Klassischen\"- und der \"Mappaint-\" Ansicht umschalten <br>"
-"indem man die \"Drahtdarstellung\"s Option im \"Anzeigen\" Menü umschaltet.</h3> "
-"<h3>Wenn dies das erste mal nach langer Zeit ist, daß Sie JOSM einsetzen, werden Sie merken,<br> "
-" daß JOSM jetzt \"Moduslos\" ist. Diese Version verzichtet (fast vollständig) auf die alten Edit-Modi, <br>"
-"wie z.B.  \"Füge Knotenpunkt ein und verbinde\"; stattdessen gibt es nur vier Modi: Zoomen,<br> "
-"Auswählen, Bearbeiten und Löschen. Der Beabreiten-Modus wird in den meisten Fällen das <br> "
-"gewünschte erfüllen (es gibt außerdem eine Mini-Hilfe über die Steuertasten in der Statusleiste).</h3>"
-"</h3>"
-
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:71
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:71
+"<html><h2>Es läuft die neueste JOSM Version mit eingebauten Mappaint-"
+"Unterstützung.</h2> <h3>Das Mappaint-Plugin ist nicht mehr nötig und wurde "
+"aus der Konfigurationsdatei entfernt (wenn<br> es eingestellt war). Man kann "
+"zwischen der \"Klassischen\"- und der \"Mappaint-\" Ansicht umschalten "
+"<br>indem man die \"Drahtdarstellung\"s Option im \"Anzeigen\" Menü "
+"umschaltet.</h3> <h3>Wenn dies das erste mal nach langer Zeit ist, daß Sie "
+"JOSM einsetzen, werden Sie merken,<br>  daß JOSM jetzt \"Moduslos\" ist. "
+"Diese Version verzichtet (fast vollständig) auf die alten Edit-Modi, <br>wie "
+"z.B.  \"Füge Knotenpunkt ein und verbinde\"; stattdessen gibt es nur vier "
+"Modi: Zoomen,<br> Auswählen, Bearbeiten und Löschen. Der Beabreiten-Modus "
+"wird in den meisten Fällen das <br> gewünschte erfüllen (es gibt außerdem "
+"eine Mini-Hilfe über die Steuertasten in der Statusleiste).</h3></h3>"
+
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:71
 msgid ""
 "<html><h3>Your preferences have been changed by removing <b>osm-server."
@@ -3574,96 +2437,61 @@
 "diese auf die Version 0.4 verwiesen haben.</h3></html>"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:74
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
 msgid "Read the [Wiki page on API 0.5]"
 msgstr "Lese die [Wiki Seite über API 0.5]"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:84
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:84
-#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:85
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:84
 msgid "Getting Started"
 msgstr "Los gehts"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:85
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:85
-#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:86
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:85
 msgid "[Download] some data from the OSM server"
 msgstr "Kartendaten vom OSM Server laden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:89
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:89
-#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:90
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:89
 msgid "Getting Help"
 msgstr "Hilfe bekommen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:90
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:90
-#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:90
 msgid "Open the [online help] (english only)"
 msgstr "Öffne die [Online Hilfe] (nur in Englisch)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/GettingStarted.java:91
-#: ../trunk/src/org/openstreetmap/josm/gui/GettingStarted.java:91
-#: ../trunk.old/src/org/openstreetmap/josm/gui/GettingStarted.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:91
 msgid "Join the newbie [mailing list]"
 msgstr "Mitglied in der Newbie [Mailingliste] werden"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:36
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Upload Preferences"
 msgstr "Einstellungen Hochladen"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:36
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:36
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:36
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:36
 msgid "Upload the current preferences to the server"
 msgstr "Die jetzigen Einstellungen auf dem OSM Server speichern"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:52
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:53
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:52
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:53
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:52
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:53
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:53
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
 msgid "string"
 msgstr "Zeichenkette"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:52
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:52
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:52
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:52
 msgid "Name of the user."
 msgstr "Name des Benutzers."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:53
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:53
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:53
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:53
 msgid "OSM Password."
 msgstr "OSM Passwort."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Ändere die Applet Größe auf den angegeben Wert (Format: BREITExHÖHE)"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "string;string;..."
 msgstr "Zeichenkette;Zeichenkette;..."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a "
@@ -3673,7 +2501,5 @@
 "Dateiname sein."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an url containing "
@@ -3683,7 +2509,5 @@
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -3693,202 +2517,132 @@
 "Suchanfrage oder eine URL auf ein osm-xml Dokument sein."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "any"
 msgstr "jeder"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:83
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:74
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:83
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:74
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:83
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:74
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:83
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:74
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../josm/src/org/openstreetmap/josm/gui/MainApplet.java:86
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:77
-#: ../trunk/src/org/openstreetmap/josm/gui/MainApplet.java:86
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/gui/MainApplet.java:86
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:77
 msgid "Password"
 msgstr "Passwort"
 
-#: ../josm/src/org/openstreetmap/josm/io/GpxReader.java:262
-#: ../trunk/src/org/openstreetmap/josm/io/GpxReader.java:262
-#: ../trunk.old/src/org/openstreetmap/josm/io/GpxReader.java:262
+#: ../../core/src/org/openstreetmap/josm/io/GpxReader.java:262
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parser Fehler: ungültige Dokumentstruktur für ein GPX Dokument"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:131
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:131
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:129
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:129
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:131
 msgid "Unknown version"
 msgstr "Version unbekannt."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:159
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:159
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:159
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:159
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:162
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:162
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:162
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:162
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:174
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:174
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 msgid "Found <member> tag on non-relation."
 msgstr "Habe <member> Tag auf einer Nicht-Relation gefunnden."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:182
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:182
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:182
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständiger <member> Beschreibung mit ref=0"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:196
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:196
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:196
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:196
 msgid "NullPointerException, Possibly some missing tags."
 msgstr "NullPointerException, vielleicht fehlende Tags."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:225
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:225
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:225
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:265
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:265
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:265
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:406
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:406
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:406
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:406
 msgid "Preparing data..."
 msgstr "Bereite Daten vor ...."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmReader.java:417
-#: ../trunk/src/org/openstreetmap/josm/io/OsmReader.java:417
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmReader.java:417
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:417
 msgid "Illformed Node id"
 msgstr "Kranke Knotenpunkt Id"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
-#: ../trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 #, java-format
 msgid "Upload {0} {1} ({2})..."
 msgstr "Überspiele {0} {1} ({2})..."
 
-#: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
-#: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
-#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
-#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:92
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
 msgid "Contacting OSM Server..."
 msgstr "Verbinde zu OSM Server ...."
 
-#: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
-#: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
-#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:49
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
 #, java-format
 msgid "Downloading points {0} to {1}..."
 msgstr "Hole Punkte {0} bis {1}..."
 
-#: ../josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
-#: ../trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
-#: ../trunk.old/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:98
 msgid "Downloading OSM data..."
 msgstr "Hole OSM-Daten..."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:73
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:73
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:80
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:80
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:80
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:84
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:84
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:84
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:87
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:87
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:87
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmConnection.java:122
-#: ../trunk/src/org/openstreetmap/josm/io/OsmConnection.java:122
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmConnection.java:122
+#: ../../core/src/org/openstreetmap/josm/io/OsmConnection.java:122
 msgid "Aborting..."
 msgstr "Abruch..."
 
-#: ../josm/src/org/openstreetmap/josm/io/OsmIdReader.java:38
-#: ../trunk/src/org/openstreetmap/josm/io/OsmIdReader.java:38
-#: ../trunk.old/src/org/openstreetmap/josm/io/OsmIdReader.java:38
+#: ../../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
 msgid "Error during parse."
 msgstr "Fehler beim parsen."
 
-#: ../josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-#: ../trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
-#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
+#: ../../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
 msgid "different"
 msgstr "verschieden"
 
-#: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
-#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
 msgid "deleted"
 msgstr "gelöscht"
 
-#: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-#: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 msgid "true"
 msgstr "wahr"
 
-#: ../josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-#: ../trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
-#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
+#: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
 msgid "false"
 msgstr "falsch"
 
-#: ../josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-#: ../trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
-#: ../trunk.old/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
+#: ../../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
 msgid "position"
 msgstr "Position"
 
-#: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
-#: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
-#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
 #, java-format
 msgid "{0} node"
@@ -3897,7 +2651,5 @@
 msgstr[1] "{0} Knotenpunkte"
 
-#: ../josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
-#: ../trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
 msgid "relation"
 msgid_plural "relations"
@@ -3905,66 +2657,47 @@
 msgstr[1] "Relationen"
 
-#: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Einstellungen auf {0} gespeichert"
 
-#: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
 
-#: ../josm/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-#: ../trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-#: ../trunk.old/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
+#: ../../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#: ../trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
-#: ../trunk.old/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
+#: ../../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
 #, java-format
 msgid "Resolve {0} conflicts in {1} objects"
 msgstr "Löse {0} Konflikte in {1} Objekten"
 
-#: ../josm/src/org/openstreetmap/josm/command/ChangeCommand.java:44
-#: ../trunk/src/org/openstreetmap/josm/command/ChangeCommand.java:44
-#: ../trunk.old/src/org/openstreetmap/josm/command/ChangeCommand.java:44
+#: ../../core/src/org/openstreetmap/josm/command/ChangeCommand.java:44
 msgid "Change"
 msgstr "Ändere"
 
-#: ../josm/src/org/openstreetmap/josm/command/MoveCommand.java:121
-#: ../trunk/src/org/openstreetmap/josm/command/MoveCommand.java:121
-#: ../trunk.old/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
 msgid "Move"
 msgstr "Verschiebe"
 
-#: ../josm/src/org/openstreetmap/josm/command/SequenceCommand.java:60
-#: ../trunk/src/org/openstreetmap/josm/command/SequenceCommand.java:60
-#: ../trunk.old/src/org/openstreetmap/josm/command/SequenceCommand.java:60
+#: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:60
 msgid "Sequence"
 msgstr "Abfolge"
 
-#: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
-#: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
-#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #, java-format
 msgid "Remove \"{0}\" for"
 msgstr "Entferne \"{0}\" für"
 
-#: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
-#: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
-#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:67
 #, java-format
 msgid "Set {0}={1} for"
 msgstr "Setze {0}={1} für"
 
-#: ../josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
-#: ../trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
-#: ../trunk.old/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
+#: ../../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:73
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
 msgid "object"
 msgid_plural "objects"
@@ -3972,27 +2705,19 @@
 msgstr[1] "Objekte"
 
-#: ../josm/src/org/openstreetmap/josm/command/RotateCommand.java:134
-#: ../trunk/src/org/openstreetmap/josm/command/RotateCommand.java:134
-#: ../trunk.old/src/org/openstreetmap/josm/command/RotateCommand.java:134
+#: ../../core/src/org/openstreetmap/josm/command/RotateCommand.java:134
 msgid "Rotate"
 msgstr "Drehen"
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:228
-#: ../trunk/src/org/openstreetmap/josm/Main.java:228
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:220
+#: ../../core/src/org/openstreetmap/josm/Main.java:228
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin nicht gefunden: {0}."
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:256
-#: ../trunk/src/org/openstreetmap/josm/Main.java:256
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:248
+#: ../../core/src/org/openstreetmap/josm/Main.java:256
 #, java-format
 msgid "Could not load plugin {0}. Deleted from preferences."
 msgstr "Kann das Plugin {0} nicht laden. Aus den Einstellungen gelöscht."
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:323
-#: ../trunk/src/org/openstreetmap/josm/Main.java:323
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:315
+#: ../../core/src/org/openstreetmap/josm/Main.java:323
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -4000,34 +2725,955 @@
 "EPSG:4263."
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:393
-#: ../trunk/src/org/openstreetmap/josm/Main.java:393
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:385
+#: ../../core/src/org/openstreetmap/josm/Main.java:393
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:395
-#: ../trunk/src/org/openstreetmap/josm/Main.java:395
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:387
+#: ../../core/src/org/openstreetmap/josm/Main.java:395
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und wirklich beenden?"
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:396
-#: ../trunk/src/org/openstreetmap/josm/Main.java:396
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:388
+#: ../../core/src/org/openstreetmap/josm/Main.java:396
 msgid "Unsaved Changes"
 msgstr "Daten nicht gespeichert"
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:408
-#: ../trunk/src/org/openstreetmap/josm/Main.java:408
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:400
+#: ../../core/src/org/openstreetmap/josm/Main.java:408
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ingnoriere die ungültige URL: \"{0}\""
 
-#: ../josm/src/org/openstreetmap/josm/Main.java:421
-#: ../trunk/src/org/openstreetmap/josm/Main.java:421
-#: ../trunk.old/src/org/openstreetmap/josm/Main.java:413
+#: ../../core/src/org/openstreetmap/josm/Main.java:421
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
 msgstr "Ignoriere die Ungültige Datei URL: \"{0}\""
 
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:43
+msgid "Open Visible ..."
+msgstr "Öffne sichtbare..."
+
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:43
+msgid "Open only files that are visible in current view."
+msgstr "Öffne nur Dateien, die in der aktuellen Ansicht sichtbar sind."
+
+#: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:52
+msgid "No view open - cannot determine boundaries!"
+msgstr "Keine Daten sichtbar, kann Grenzen nicht bestimmen!"
+
+#: ../utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:30
+#, fuzzy
+msgid "Simplify Way"
+msgstr "Weg aufspalten"
+
+#: ../utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:31
+#, fuzzy
+msgid "Delete unnecessary nodes from a way."
+msgstr "Lösche Knotenpunkte oder Wege."
+
+#: ../utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:79
+#, java-format
+msgid "Simplify Way (remove {0} nodes)"
+msgstr "Vereinfache Weg (entferne {0} Knoten)"
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:42
+msgid "Lake Walker."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:120
+#, fuzzy
+msgid "Tracing"
+msgstr "Zeichenkette"
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:24
+msgid "Lake Walker"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:31
+msgid "Python executable"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:33
+#, fuzzy
+msgid "Maximum number of segments per way"
+msgstr "Zeige die Ordnungsnummer für alle Segmente innerhalb des Weges."
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:35
+msgid "Maximum number of nodes in initial trace"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:37
+msgid "Maximum gray value to count as water (0-255)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:39
+msgid "Line simplification accuracy (degrees)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+msgid "Size of Landsat tiles (pixels)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+msgid "Shift all traces to east (degrees)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+msgid "Shift all traces to north (degrees)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+msgid "Direction to search for land"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+msgid "Tag ways as"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+msgid "Path to python executable."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 35."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+msgid "Direction to search for land. Default east."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#, java-format
+msgid ""
+"An interlude to the Lakewalker Python module to trace water bodies on "
+"Landsat imagery.<br><br>Version: {0}"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+msgid "Lakewalker Plugin Preferences"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:116
+msgid "Lakewalker trace"
+msgstr ""
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+#, fuzzy
+msgid "Tagging Preset Tester"
+msgstr "Tagging Vorlagen"
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
+msgid "Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+
+#: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:28
+#, fuzzy
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr "Eine neue Voreinstellungsquelle zu der Liste hinzufügen"
+
+#: ../grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:193
+#: ../livegps/livegps/LiveGpsDialog.java:51
+msgid "Latitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:195
+#: ../livegps/livegps/LiveGpsDialog.java:53
+msgid "Longitude"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:200
+msgid "Grid layout"
+msgstr ""
+
+#: ../grid/src/grid/GridLayer.java:222
+msgid "Grid layer:"
+msgstr "Raster Ebene:"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:52
+msgid "Untagged, empty, and one node ways."
+msgstr " Leere Wege, Wege, die nur aus einem Knoten bestehen und Wege ohne Zusatzinformationen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:53
+msgid "This test checks for untagged, empty and one node ways."
+msgstr "Dieser Test sucht leere Wege, Wege, die nur aus einem Knoten bestehen und Wege ohne Zusatzinformationen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:83
+msgid "Unnamed ways"
+msgstr "Unbenannte Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
+msgid "Untagged ways"
+msgstr "Wege ohne Zusatzinformationen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:95
+msgid "Empty ways"
+msgstr "Leere Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100
+msgid "One node ways"
+msgstr "Wege, die nur aus einem Knoten bestehen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
+msgid "Duplicated nodes."
+msgstr "Doppelte Knoten."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+msgid "This test checks that there are no nodes at the very same location."
+msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+msgid "Duplicated nodes"
+msgstr "Doppelte Knoten"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:109
+msgid "Nodes have conflicting key: "
+msgstr "Knoten haben unverreinbare Schlüssel: "
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:66
+#, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "Ersetze \"{0}\" mit \"{1}\" für"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:33
+msgid "Coastlines."
+msgstr "Küsten."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:34
+msgid "This test checks that coastlines are correct."
+msgstr "Dieser Test überprüft ob die Küsten korrekt sind."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:78
+msgid "Unordered coastline"
+msgstr "Ungeordnete Küsten"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
+msgid "Untagged nodes."
+msgstr "Knoten ohne Zusatzinformationen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+#, fuzzy
+msgid "This test checks for untagged nodes that are not part of any way."
+msgstr "Der gewählte Knotenpunkt ist nicht Teil eines Weges."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:101
+msgid "Untagged and unconnected nodes"
+msgstr "Knoten ohne Zusatzinformation oder ohne Verbindung"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:16
+msgid "Duplicated way nodes."
+msgstr "Doppelte Knoten im Weg."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:17
+msgid "Checks for ways with identical consecutive nodes."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:30
+#, fuzzy
+msgid "Duplicated way nodes"
+msgstr "Verdoppeln"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:18
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:30
+msgid "Self-intersecting ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:19
+msgid "This test checks for ways that contain some of their nodes more than once"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:33
+msgid "Similar named ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:34
+msgid "This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:79
+msgid "Similar named ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:32
+msgid "Overlapping ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:33
+msgid ""
+"This test checks that a connection between two nodes is not used by more "
+"than one way."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:52
+msgid "Overlapping ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:31
+#, fuzzy
+msgid "Crossing ways."
+msgstr "Verbinde {0} Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:32
+msgid ""
+"This test checks if two roads, railways or waterways crosses in the same "
+"layer, but are not connected by a node."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:92
+#, fuzzy
+msgid "Crossing ways"
+msgstr "Verbinde {0} Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:112
+#, fuzzy
+msgid "Properties checker."
+msgstr "Einstellungen/Mitgliedschaften"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:113
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:179
+#, fuzzy, java-format
+msgid ""
+"Could not download spellcheck data file:\n"
+" {0}"
+msgstr "Kann das Plugin {0} nicht von {1} laden"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:234
+#, fuzzy
+msgid "Tags with empty values"
+msgstr "Tags (leerer Wert löscht das Tag)"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:239
+msgid "Invalid property keys"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:247
+#, fuzzy
+msgid "Unknown property values"
+msgstr "Unbekannter Typ"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:255
+msgid "FIXMES"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:363
+#, fuzzy
+msgid "Check property keys."
+msgstr "Einstellungen ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:364
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:383
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:396
+msgid "Spellcheck source"
+msgstr "Quelle für Rechtschreibüberprüfung"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:416
+#, fuzzy
+msgid ""
+"The sources (url or filename) of spell check data files. See http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller for help."
+msgstr ""
+"Die Quellen (URL oder Dateiname) für Vorlagendateien. Siehe http://josm."
+"openstreetmap.de/wiki/TaggingPresets für Hilfe."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:417
+msgid "Add a new spellcheck source to the list."
+msgstr "Eine neue Quelle für die Rechtschreibüberprüfung zu der Liste hinzufügen"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:418
+#, fuzzy
+msgid "Edit the selected source."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:421
+msgid "Spellcheck data sources"
+msgstr "Quelle für Rechtschreibüberprüfungsdaten"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:445
+#, fuzzy
+msgid "Check property values."
+msgstr "Einstellungen ändern"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:446
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:454
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:455
+msgid "Looks for nodes or ways with FIXME in any property value."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:81
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:60
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:103
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:83
+msgid "Grid"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:220
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:225
+#, fuzzy, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr "Fehler beim Parsen {0}:"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+msgid ""
+"A OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
+#, fuzzy, java-format
+msgid "Version: {0}<br>Last change at {1}"
+msgstr "Letzte Änderung am {0}"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+msgid "Data validator"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:60
+#, fuzzy
+msgid "Open the validation window."
+msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:101
+msgid "No validation errors"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:23
+#, fuzzy
+msgid "Downloading "
+msgstr "Lade Daten aus dem Internet"
+
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:38
+#, fuzzy
+msgid "Contacting WMS Server..."
+msgstr "Verbinde zu OSM Server ...."
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:62
+msgid "Wrong longitude transformation for tile manager. Can't operate on {0}"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:92
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:143
+msgid "Save WMS layer to file"
+msgstr "Speichere WMS-Ebene in Datei"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:165
+msgid "Load WMS layer from file"
+msgstr "Lade WMS-Ebene aus Datei"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:175
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:176
+msgid "File Format Error"
+msgstr "Dateiformatfehler"
+
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:191
+#, fuzzy
+msgid "Error loading file"
+msgstr "Fehler bei der Klang Ausgabe."
+
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:98
+msgid "WMS"
+msgstr "WMS"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "WMS Plugin Preferences"
+msgstr "Einstellungen für WMS Plugin"
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:36
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:108
+#, fuzzy
+msgid "Version"
+msgstr "Version"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:88
+#, fuzzy
+msgid "Add Site"
+msgstr "Gewähltes hinzufügen"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:91
+msgid "Update Site Url"
+msgstr "Url für Update Site"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
+msgid "Invalid Url"
+msgstr "Ungültige Url"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:109
+#, fuzzy
+msgid "Delete Site(s)"
+msgstr "Löschen"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:113
+#, fuzzy
+msgid "Please select the site to delete."
+msgstr "Bitte wählen Sie die zu löschende Zeile."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+msgid "Check Site(s)"
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
+#, fuzzy
+msgid "Please select the site(s) to check for updates."
+msgstr "Bitte mindestens vier Knotenpunkte auswählen."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:152
+msgid "Add a new plugin site."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:153
+#, fuzzy
+msgid "Delete the selected site(s) from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+msgid "Check the selected site(s) for new plugins or updates."
+msgstr ""
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
+#, fuzzy
+msgid "Update Sites"
+msgstr "Plugins aktualisieren"
+
+#: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:59
+msgid "Install"
+msgstr "Installieren"
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java:28
+msgid "Navigate"
+msgstr "Navigieren"
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:40
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:44
+msgid "Navigation"
+msgstr "Navigation"
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java:47
+msgid "Reset Graph"
+msgstr "Graphen zurücksetzen"
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Navigator"
+msgstr "Navigator"
+
+#: ../navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorModeAction.java:28
+msgid "Set start/end for autorouting. Middle Mouse button to reset."
+msgstr "Setze Anfang/Ende für Routenberechnung. Zurücksetzen mit mittlerer Maustaste."
+
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
+#, fuzzy
+msgid "Duplicate Way"
+msgstr "Verdoppeln"
+
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
+#, fuzzy
+msgid "Duplicate selected ways."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
+msgid "Can't duplicate unnordered way."
+msgstr ""
+
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
+#, fuzzy
+msgid "You must select at least one way."
+msgstr "Bitte mindestens einen Weg wählen."
+
+#: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
+msgid "Create duplicate way"
+msgstr ""
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open waypoints file"
+msgstr "Datei öffnen."
+
+#: ../waypoints/src/WaypointOpenAction.java:33
+#, fuzzy
+msgid "Open a waypoints file."
+msgstr "Datei öffnen."
+
+#: ../waypoints/src/WaypointReader.java:55
+#, java-format
+msgid "Data error: lat value \"{0}\" is out of bound."
+msgstr ""
+
+#: ../waypoints/src/WaypointReader.java:59
+#, java-format
+msgid "Data error: lon value \"{0}\" is out of bound."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
+msgid "start"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
+msgid "end"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:58
+msgid "SurveyorPlugin depends on LiveGpsPlugin!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:59
+msgid "LiveGpsPlugin not found, please install and activate."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:60
+msgid "SurveyorPlugin is disabled for the moment"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+msgid "SurveyorPlugin"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#, fuzzy, java-format
+msgid "Error while exporting {0}: {1}"
+msgstr "Fehler beim exportieren von {0}"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
+msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+msgid "AutoSave LiveData"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#, fuzzy
+msgid "Save captured data to file every minute."
+msgstr "Speichere die aktuellen Daten in eine neue Datei."
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+#, fuzzy
+msgid "Surveyor ..."
+msgstr "Suche ..."
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:45
+msgid "Open surveyor tool."
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+msgid "Surveyor"
+msgstr ""
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
+#, fuzzy, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Konnte nicht von URL \"{0}\" lesen"
+
+#: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#, fuzzy, java-format
+msgid "Error parsing {0}: {1}"
+msgstr "Fehler beim Parsen {0}:"
+
+#: ../osmarender/src/OsmarenderPlugin.java:79
+msgid ""
+"FireFox not found. Please set firefox executable in the Map Settings page of "
+"the preferences."
+msgstr ""
+
+#: ../osmarender/src/OsmarenderPlugin.java:128
+#, fuzzy
+msgid "osmarender options"
+msgstr "Export-Einstellungen"
+
+#: ../osmarender/src/OsmarenderPlugin.java:129
+msgid "FireFox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
+msgid "Could not start browser. Please check that the executable path is correct."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:41
+msgid ""
+"<html>Path to firefox executable.<br>The Firefox profile used in this plugin "
+"<b>must</b> be configured with the javascript 'dump' method,<br>that can be "
+"activated with the property 'browser.dom.window.dump.enabled=true' in the "
+"about:config page.</html>"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:44
+msgid ""
+"<html>The port that the server will use to listen WMS requests<br>The WMS "
+"plugin need to be configured to use this port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:46
+msgid ""
+"<html>Name of the profile.<br>This profile is used to avoid nag firefox "
+"screens asking you to resume failed sessions.<br>Just set the selected "
+"profile as not default in the profile selection window and configure to not "
+"ask<br>about failed sessions with 'browser.sessionstore."
+"resume_from_crash=false' in the about:config page"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:53
+msgid "A WMS server for Yahoo imagery based on Firefox."
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+msgid "Yahoo! WMS server"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:56
+#, fuzzy
+msgid "Settings for the Yahoo! imagery server."
+msgstr "Verbinungseinstellungen zum OSM Server."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:57
+#, fuzzy
+msgid "YWMS options"
+msgstr "Optionen"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:59
+msgid "Firefox executable"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:62
+msgid "Firefox profile"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:64
+#, fuzzy
+msgid "Create"
+msgstr "Datum"
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:68
+msgid "Server port"
+msgstr ""
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:133
+#, fuzzy
+msgid "Please name the profile you want to create."
+msgstr "Bitte wählen Sie die Objekte für die Einstellungen geändert werden sollen."
+
+#: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:139
+msgid "Creating profile"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+msgid "Use"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#, fuzzy
+msgid "Please select a scheme to use."
+msgstr "Bitte mindestens drei Knotenpunkte auswählen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+msgid "Color Scheme"
+msgstr ""
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:97
+#, fuzzy
+msgid "Please select the scheme to delete."
+msgstr "Bitte wählen Sie die zu löschende Zeile."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#, fuzzy
+msgid "Use the selected scheme from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#, fuzzy
+msgid "Use the current colors as a new color scheme."
+msgstr "Speichere die aktuellen Daten in eine neue Datei."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#, fuzzy
+msgid "Delete the selected scheme from the list."
+msgstr "Ausgewählte Quelle löschen."
+
+#: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
+#, fuzzy
+msgid "Color Schemes"
+msgstr "Farben"
+
+#: ../namefinder/namefinder/PlaceSelection.java:45
+#, fuzzy
+msgid "Search..."
+msgstr "Suche ..."
+
+#: ../namefinder/namefinder/PlaceSelection.java:120
+#, fuzzy
+msgid "NullPointerException. Possible some missing tags."
+msgstr "NullPointerException, vielleicht fehlende Tags."
+
+#: ../namefinder/namefinder/PlaceSelection.java:177
+#, fuzzy
+msgid "Cannot read place search results from server"
+msgstr "Kann keine Einstellungen vom Server laden."
+
+#: ../namefinder/namefinder/PlaceSelection.java:197
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../namefinder/namefinder/PlaceSelection.java:209
+msgid "Places"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:95
+#: ../livegps/livegps/LiveGpsAcquirer.java:111
+#, fuzzy
+msgid "Connecting"
+msgstr "Verbindungseinstellungen"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:170
+msgid "Connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:182
+#: ../livegps/livegps/LiveGpsAcquirer.java:197
+msgid "Not connected"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:191
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Verbindungseinstellungen"
+
+#: ../livegps/livegps/LiveGpsPlugin.java:39
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:39
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:49
+msgid "Center Once"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:49
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:61
+msgid "Auto-Center"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsPlugin.java:61
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+msgid "Live GPS"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:44
+#, fuzzy
+msgid "Show GPS data."
+msgstr "Roh GPS-Daten"
+
+#: ../livegps/livegps/LiveGpsDialog.java:47
+msgid "Status"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:49
+#, fuzzy
+msgid "Way Info"
+msgstr "Info"
+
+#: ../livegps/livegps/LiveGpsDialog.java:55
+msgid "Speed"
+msgstr ""
+
+#: ../livegps/livegps/LiveGpsDialog.java:57
+#, fuzzy
+msgid "Course"
+msgstr "Wähle"
+
+#: ../slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:52
+msgid "Tile Sources"
+msgstr ""
+