Index: /applications/editors/josm/plugins/lang/de/LIESMICH
===================================================================
--- /applications/editors/josm/plugins/lang/de/LIESMICH	(revision 7001)
+++ /applications/editors/josm/plugins/lang/de/LIESMICH	(revision 7002)
@@ -1,21 +1,33 @@
 Bauen geht wie folgt:
 
+Variante 1 - per Gesamt-Checkout
+================================
 mkdir buildme
 cd buildme
-svn co http://svn.openstreetmap.org/applications/editors/josm/plugins/lang/de/
-svn co http://josm.openstreetmap.de/svn/trunk
-ln -s trunk josm
-cd josm
+svn co http://svn.openstreetmap.org/applications/editors/josm
+cd core; ant
+cd ../plugins/lang/de
+  # Achtung: Das Plugin wird gleich ohne Rückfrage nach ~/.josm/plugins/ 
+  # installiert!!
 ant
-cd de
-
-Achtung: Das Plugin wird gleich ohne Rückfrage nach ~/.josm/plugins/ 
-installiert!!
-
+  # Nun kann man die de.po datei verändern. z.B. mit kbabel
+  # Anschliessend wieder bauen mit
 ant
 
-Nun kann man die de.po datei verändern. z.B. mit kbabel
 
-Anschliessend wieder bauen mit
+Variante 2 - nur die nötigen Teile auschecken
+=============================================
+mkdir buildme
+cd buildme
+svn co http://svn.openstreetmap.org/applications/editors/josm/plugins/lang/de/ plugins/lang/de
+svn co http://josm.openstreetmap.de/svn/trunk
+ln -s trunk core
+cd core
 ant
-
+cd ../plugins/lang/de
+  # Achtung: Das Plugin wird gleich ohne Rückfrage nach ~/.josm/plugins/ 
+  # installiert!!
+ant
+  # Nun kann man die de.po datei verändern. z.B. mit kbabel
+  # Anschliessend wieder bauen mit
+ant
Index: /applications/editors/josm/plugins/lang/de/build.xml
===================================================================
--- /applications/editors/josm/plugins/lang/de/build.xml	(revision 7001)
+++ /applications/editors/josm/plugins/lang/de/build.xml	(revision 7002)
@@ -8,5 +8,5 @@
 
 	<target name="compile" depends="init">
-		<javac srcdir="src" classpath="../josm/dist/josm-custom.jar" destdir="bin" />
+		<javac srcdir="src" classpath="../../../core/dist/josm-custom.jar" destdir="bin" />
 		<copy file="src/org/openstreetmap/josm/i18n.properties" tofile="bin/org/openstreetmap/josm/i18n.properties" />
 	</target>
@@ -30,5 +30,5 @@
 	<target name="find">
 		<exec executable="find" output="alljava.txt">
-			<arg line="../josm/src ../ -name '*.java'"/>
+			<arg line="../../../core/src ../ -name '*.java'"/>
 		</exec>
 	</target>
Index: /applications/editors/josm/plugins/lang/de/de.po
===================================================================
--- /applications/editors/josm/plugins/lang/de/de.po	(revision 7001)
+++ /applications/editors/josm/plugins/lang/de/de.po	(revision 7002)
@@ -8,5 +8,5 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-27 00:15+0100\n"
+"POT-Creation-Date: 2008-03-01 15:43+0100\n"
 "PO-Revision-Date: 2008-02-29 16:05+0100\n"
 "Last-Translator: Matthias Merz <openstreetmap@merz.inka.de>\n"
@@ -50,5 +50,6 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:35
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:67
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerActionOld.java:53
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 msgid "No data loaded."
@@ -95,7 +96,7 @@
 msgstr "Suche"
 
-#: ../../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/actions/mapmode/DeleteAction.java:53
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:220
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:62
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93
@@ -103,8 +104,8 @@
 #: ../../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/gui/preferences/PluginPreference.java:148
 #: ../../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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:405
 #: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:93
@@ -112,18 +113,18 @@
 msgstr "Löschen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:61
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55
 msgid "Delete nodes or ways."
 msgstr "Lösche Knotenpunkte oder Wege."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:209
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:230
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:223
 msgid "Cannot delete: Selection is used by relation"
 msgstr "Kann nicht löschen: Auswahl wird bei einer Relation benutzt."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:279
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:284
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:277
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -186,33 +187,35 @@
 "Shift: Nicht verbinden. Alt: neuer Weg"
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:76
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:76
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:233
 msgid "Select"
 msgstr "Auswahl"
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:76
 msgid "Select, move and rotate objects"
 msgstr "Objekte auswählen, verschieben, und drehen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:157
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:185
+#: ../../core/src/org/openstreetmap/josm/actions/MoveAction.java:82
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:294
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:315
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen um Objekete im Rechteck auszuwählen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:296
-msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:317
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 "Um die Bewegung zu stoppen, Maustaste loslassen. Strg: mit dem nächsten "
 "Punkt vereinigen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:298
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:319
 msgid "Release the mouse button to stop rotating."
 msgstr "Um das Drehen zu stoppen, Maustaste loslassen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:300
+#: ../../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:321
 msgid ""
 "Move objects by dragging; Shift to add to selection; Shift-Ctrl to rotate "
@@ -222,9 +225,9 @@
 "oder Auswahl ändern."
 
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:30
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
 
-#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:72
+#: ../../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71
 msgid "Raw GPS data"
 msgstr "Rohe GPS-Daten"
@@ -258,13 +261,13 @@
 msgstr "Einstellungen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:39
 msgid "Open ..."
 msgstr "Öffnen..."
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:43
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:39
 msgid "Open a file."
 msgstr "Datei öffnen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:66
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:62
 #: ../waypoints/src/WaypointOpenAction.java:59
 #, java-format
@@ -272,5 +275,5 @@
 msgstr "Fehler beim parsen {0}"
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:69
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:65
 #: ../waypoints/src/WaypointOpenAction.java:63
 #, java-format
@@ -278,10 +281,10 @@
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:80
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:76
 #: ../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."
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:82
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:78
 #: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:106
 #, java-format
@@ -289,5 +292,5 @@
 msgstr "Dateiendung unbekannt: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:96
+#: ../../core/src/org/openstreetmap/josm/actions/OpenAction.java:93
 #: ../openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:120
 #, java-format
@@ -296,5 +299,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:30
-#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:70
+#: ../../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:80
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
@@ -309,13 +312,13 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:62
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
 msgid "Rename layer"
 msgstr "Ebene umbennen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:45
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
 msgid "Also rename the file"
 msgstr "Die Datei mit umbennen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:86
+#: ../../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
 #, java-format
 msgid "Could not rename the file \"{0}\"."
@@ -342,13 +345,13 @@
 msgstr "Beende das Programm."
 
-#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiere gewählte Objekte in die Zwischenablage."
 
-#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:40
+#: ../../core/src/org/openstreetmap/josm/actions/CopyAction.java:48
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum Kopieren auswählen."
@@ -399,5 +402,10 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:216
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:210
+#, fuzzy
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Verschiebe gewählte Punkte in einen Kreis."
+
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:220
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -407,5 +415,5 @@
 "Mitte des Weges zu wählen)"
 
-#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
+#: ../../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:255
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -432,18 +440,6 @@
 msgstr "CSV Dateien (.csv .txt)"
 
-#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
-msgid "Join node to way"
-msgstr "Knotenpunkt in den Weg einfügen"
-
-#: ../../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 nähesten Stelle in den Weg ein."
-
-#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
-msgid "Join Node and Line"
-msgstr "Vereinige Punkt und Linie"
-
 #: ../../core/src/org/openstreetmap/josm/actions/HelpAction.java:55
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:117
 msgid "Help"
 msgstr "Hilfe"
@@ -541,5 +537,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:135
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:192
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:170
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:102
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
@@ -634,10 +630,10 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:111
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:215
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:219
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
 #: ../../core/src/org/openstreetmap/josm/actions/AboutAction.java:116
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:142
 msgid "Plugins"
@@ -670,10 +666,10 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:219
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "File exists. Overwrite?"
 msgstr "Datei existiert bereits. Überschreiben?"
 
 #: ../../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:42
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:219
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:197
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -754,18 +750,18 @@
 msgstr "Sende Daten"
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into one."
 msgstr "Mehrere Knotenpunkte zu einem vereinigen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:72
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Punkte zum Vereinigen wählen."
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:146
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:147
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -775,14 +771,14 @@
 "wirklich vereint werden?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
 msgid "Merge nodes with different memberships?"
 msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:172
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:188
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:176
 msgid "Enter values for all conflicts."
 msgstr "Werte für alle Konflikte eingeben."
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -790,5 +786,5 @@
 "wird."
 
-#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:263
+#: ../../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:267
 #, java-format
 msgid "Merge {0} nodes"
@@ -832,20 +828,20 @@
 
 #: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:153
-#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:195
 msgid "CSV output not supported yet."
 msgstr "CSV Ausgabe ist noch nicht möglich."
 
 #: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:156
-#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:197
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:198
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
 #: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:162
-#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:203
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
 #: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
-#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
 msgid "An error occurred while restoring backup file."
 msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
@@ -871,17 +867,17 @@
 msgstr "unbenannt"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine Way"
 msgstr "Weg verbinden"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:51
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Verbindet mehrere Wege zu einem."
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:65
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen sie mindestens zwei Wege zum Verbinden."
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:109
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:110
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -891,9 +887,9 @@
 "sie wirklich verbunden werden?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:111
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
 msgid "Combine ways with different memberships?"
 msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:139
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -903,18 +899,18 @@
 "Sie, daß einige Richtungen gedreht werden?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:140
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
 msgid "Change directions?"
 msgstr "Richtung ändern?"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:206
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Verbinde {0} Wege"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:242
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
 
-#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:271
+#: ../../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:260
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -932,4 +928,95 @@
 msgstr "Speichere die aktuellen Daten."
 
+#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:36
+msgid "Join node to way"
+msgstr "Knotenpunkt in den Weg einfügen"
+
+#: ../../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 nähesten Stelle in den Weg ein."
+
+#: ../../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:73
+msgid "Join Node and Line"
+msgstr "Vereinige Punkt und Linie"
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:22
+#, fuzzy
+msgid "Back"
+msgstr "Track"
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:22
+msgid "Jump back."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:22
+msgid "Forward"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:22
+msgid "Jump forward"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/pause"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/pause audio."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:19
+msgid "Previous Marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:19
+msgid "Play previous marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:19
+msgid "Next Marker"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:19
+msgid "Play next marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:11
+#, fuzzy
+msgid "Faster"
+msgstr "Einfügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:11
+msgid "Faster Forward"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:11
+msgid "Slower"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:11
+msgid "Slower Forward"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/actions/MoveAction.java:31
+#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
+msgid "Move"
+msgstr "Verschiebe"
+
+#: ../../core/src/org/openstreetmap/josm/actions/MoveAction.java:31
+#, fuzzy
+msgid "Moves Objects"
+msgstr "# Objekte"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
+#: ../../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:58
+#, fuzzy
+msgid "Paste Tags"
+msgstr "Einfügen"
+
+#: ../../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#, fuzzy
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "Zeige die Versionen aller gewählten Objekte."
+
 #: ../../core/src/org/openstreetmap/josm/tools/ShortCutLabel.java:15
 msgid "Ctrl-"
@@ -954,5 +1041,6 @@
 #: ../../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62
 #, java-format
-msgid "An unexpected exception occurred, that may come from in the ''{0}'' plugin."
+msgid ""
+"An unexpected exception occurred, that may come from in the ''{0}'' plugin."
 msgstr ""
 "Einen unvorhergesehene Ausnahme trat auf, welche vom Plugin \"{0}\" kommen "
@@ -1028,5 +1116,13 @@
 msgstr "Der Text wurde bereits in Ihre Zwischenablage kopiert."
 
-#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:107
+#: ../../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:297
+msgid "This is after the end of the recording"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:337
+msgid "Error playing sound"
+msgstr "Fehler bei der Klangausgabe."
+
+#: ../../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:103
 msgid "unknown"
 msgstr "unbekannt"
@@ -1061,5 +1157,6 @@
 #: ../../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."
+msgid ""
+"The plugin {0} seem to be broken or could not be downloaded automatically."
 msgstr ""
 "Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch "
@@ -1114,8 +1211,10 @@
 #: ../../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 den gewählten Objekten aus der obigen Liste."
+msgstr ""
+"Öffnet ein Dialog-Fenster mit den gewählten Objekten aus der obigen Liste."
 
 #: ../../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."
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 "Setze die gewählten Elemente auf der Karte auf die obige Liste der "
@@ -1192,53 +1291,66 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:102
-msgid "Edit Relation"
+#, fuzzy
+msgid "Create new relation"
+msgstr "Eine neue Relation erstellen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
+#, fuzzy
+msgid "Edit new relation"
 msgstr "Relation bearbeiten"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:104
+#, fuzzy, java-format
+msgid "Edit relation #{0}"
+msgstr "Relation bearbeiten"
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:155
 #: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:155
 #: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
 msgid "Value"
 msgstr "Wert"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:377
 msgid "Role"
 msgstr "Rolle"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:176
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
 msgid "Occupied By"
 msgstr "Belegt durch"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (leerer Wert löscht das Tag)"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:214
 msgid "Add Selected"
 msgstr "Gewähltes hinzufügen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:214
 msgid "Add all currently selected objects as members"
 msgstr "Füge alle gewählten Objekte als Mitglieder hinzu"
 
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:218
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:220
 msgid "Remove the member in the current table row from this relation"
-msgstr "Entferne das Mitglied in der aktuellen Tabellenzeile von dieser Relation."
-
-#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:229
+msgstr ""
+"Entferne das Mitglied in der aktuellen Tabellenzeile von dieser Relation."
+
+#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:233
 msgid "Highlight the member from the current table row as JOSM's selection"
-msgstr "Übernehme das Mitglied der aktuellen Tabellenzeile als Auswahl in JOSM."
+msgstr ""
+"Übernehme das Mitglied der aktuellen Tabellenzeile als Auswahl in JOSM."
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63
@@ -1259,9 +1371,11 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:105
-msgid "Show/Hide Text"
+#, fuzzy
+msgid "Show/Hide Text/Icons"
 msgstr "Zeige/Verstecke Text"
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:106
-msgid "Toggle visible state of the marker text."
+#, fuzzy
+msgid "Toggle visible state of the marker text and icons."
 msgstr "Schaltet den Wegpunkttext zwischen sichtbar und unsichbar um."
 
@@ -1306,8 +1420,8 @@
 #: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:138
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:112
 #: ../grid/src/grid/GridPlugin.java:43 ../grid/src/grid/GridPlugin.java:49
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:390
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:391
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1341,5 +1455,6 @@
 #: ../../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 Eigenschaften geändert werden sollen."
+msgstr ""
+"Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:127
@@ -1377,6 +1492,5 @@
 msgid "Please select objects for which you want to change properties."
 msgstr ""
-"Bitte wählen Sie die Objekte für die Eigenschaften geändert werden "
-"sollen."
+"Bitte wählen Sie die Objekte für die Eigenschaften geändert werden sollen."
 
 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:215
@@ -1403,5 +1517,5 @@
 #: ../../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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:395
 msgid "Please select the row to edit."
 msgstr "Bitte wählen sie eine Zeile zum Bearbeiten."
@@ -1410,5 +1524,5 @@
 #: ../../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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:409
 #: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Please select the row to delete."
@@ -1418,8 +1532,8 @@
 #: ../../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/preferences/PluginPreference.java:131
 #: ../../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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:381
 #: ../wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:55
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
@@ -1473,5 +1587,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:419
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:420
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle löschen."
@@ -1515,5 +1629,6 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-msgid "Login password to the OSM account. Leave blank to not store any password."
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 "Passwort für den OSM Server. Leer lassen, wenn kein Passwort gespeichert "
@@ -1555,7 +1670,7 @@
 "Koordinatenangabe<br><b>time</b>: Die gemessene Zeit als "
 "Zeichenkette<br><b>ignore</b>: Lasse dieses Feld aus<br> Ein Beispiel: "
-"\"ignore ignore lat lon\" wird ' ' als Trenzeichen verwenden, lässt die ersten "
-"zwei Werte aus und liest dann Länge und Breite.<br>Anderes Beispiel: \"lat,lon\" "
-"liest einfach die Länge und Breite durch Komma getrennt.</html>"
+"\"ignore ignore lat lon\" wird ' ' als Trenzeichen verwenden, lässt die "
+"ersten zwei Werte aus und liest dann Länge und Breite.<br>Anderes Beispiel: "
+"\"lat,lon\" liest einfach die Länge und Breite durch Komma getrennt.</html>"
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/CsvPreference.java:30
@@ -1600,5 +1715,6 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-msgid "Force drawing of lines if the imported data contain no line information."
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -1669,5 +1785,5 @@
 #: ../../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/data/osm/visitor/NameVisitor.java:63
 #: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
 #: ../../core/src/org/openstreetmap/josm/command/RotateCommand.java:134
@@ -1683,5 +1799,5 @@
 #: ../../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
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89
 msgid "way"
 msgid_plural "ways"
@@ -1709,13 +1825,13 @@
 msgstr "Inaktiv"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:77
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
 msgid "Configure available plugins."
 msgstr "Bearbeite verfügbare Plugins."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
 msgid "Download List"
 msgstr "Liste laden"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -1724,38 +1840,38 @@
 msgstr[1] "Lade Plugin Informationen von {0} Seiten"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
 msgid "No plugin information found."
 msgstr "Keine Plugin Informationen gefunden."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
 msgid "Update"
 msgstr "Update"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:110
 msgid "Configure Sites ..."
 msgstr "Seiten Konfigurieren ...."
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:133
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:144
 msgid "Add either site-josm.xml or Wiki Pages."
 msgstr "Bitte entwerde site-josm.xml oder Wiki Seiten hinzufügen."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:137
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:151
 msgid "Please select an entry."
 msgstr "Bitte wählen Sie einen Eintrag."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:154
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:158
 msgid "Configure Plugin Sites"
 msgstr "Plugin Seiten bearbeiten"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:177
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:181
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:184
 #, java-format
 msgid ""
@@ -1768,14 +1884,14 @@
 "{0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:214
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:218
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM verbunden"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:259
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:267
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr "Fehler beim lesen der Plugin-Informationsdatei: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:286
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:295
 #, java-format
 msgid ""
@@ -1788,5 +1904,5 @@
 "{0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:287
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins holen"
@@ -1800,5 +1916,6 @@
 "Various settings that influence the visual representation of the whole "
 "program."
-msgstr "Diverse Optionen die die visuelle Repräsentation des Programms beinflussen."
+msgstr ""
+"Diverse Optionen die die visuelle Repräsentation des Programms beinflussen."
 
 #: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
@@ -1818,7 +1935,114 @@
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:79
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#, fuzzy
+msgid "Audio Settings"
+msgstr "Karten-Einstellungen"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#, fuzzy
+msgid "Settings for the audio player and audio markers."
+msgstr "Verbinungseinstellungen zum OSM Server."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:80
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr "Sie müssen das Programm neu starten damit die Einstellungen wirksam werden."
+msgstr ""
+"Sie müssen das Programm neu starten damit die Einstellungen wirksam werden."
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:29
+#, fuzzy
+msgid "Display the Audio menu."
+msgstr "Über dieses Programm"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Label audio (and image and web) markers."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+#, fuzzy
+msgid "Display live audio trace."
+msgstr "Über dieses Programm"
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Create audio markers from named trackpoints."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:54
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:66
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
+msgid ""
+"Minimum time in seconds between audio samples when creating sampled audio "
+"markers from waypoints"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid "Min audio marker sample rate (seconds)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"Minimum distance in metres between audio samples when creating sampled audio "
+"markers from waypoints"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Min audio marker sample rate (metres)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Forward/back time (seconds)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Fast forward multiplier"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:119
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:120
+msgid "Voice recorder calibration"
+msgstr ""
 
 #: ../../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:51
@@ -1868,5 +2092,7 @@
 #: ../../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 benutzen/./ um zu zoomen und zu verschieben."
+msgstr ""
+"Sie können die Maus oder Strg+Pfeiltasten benutzen/./ um zu zoomen und zu "
+"verschieben."
 
 #: ../../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
@@ -1886,33 +2112,29 @@
 msgstr "Bitte wählen Sie ein Lesezeichen."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 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 Wegpunkt"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "(URL was: "
 msgstr "(Die URL war:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46
 msgid "Error displaying URL"
 msgstr "Fehler beim Anzeigen der URL"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:103
 msgid "name"
 msgstr "Name"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:105
+msgid "desc"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:109
 msgid "symbol"
 msgstr "Symbol"
 
-#: ../../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."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java:89
-msgid "Error playing sound"
-msgstr "Fehler bei der Klangausgabe."
-
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:130
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid "marker"
 msgid_plural "markers"
@@ -1920,5 +2142,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:148
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -1927,20 +2149,20 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:328
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: ../../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/layer/markerlayer/MarkerLayer.java:279
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:333
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
 msgid "OK"
 msgstr "OK"
 
-#: ../../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/layer/markerlayer/MarkerLayer.java:279
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:333
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:26
 #: ../grid/src/grid/GridLayer.java:162 ../grid/src/grid/GridLayer.java:199
@@ -1949,25 +2171,72 @@
 msgstr "Abbrechen"
 
-#: ../../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/layer/markerlayer/MarkerLayer.java:279
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:333
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:280
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:334
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:75
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:406
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:295
+msgid "Apply Audio"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:308
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:322
+msgid "Synchronize Audio"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:330
+msgid "Make Audio Marker At Play Head"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:358
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "No audio marker found in the layer to synchronize with."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:396
+msgid ""
+"Audio synchronized with most recently played marker and subsequent ones "
+"(that have the same sound track)."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:397
+msgid ""
+"Audio synchronized with audio markers in the layer (that have the same sound "
+"track as the first one)."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:402
+msgid ""
+"You need to pause audio at the point on the track where you want the marker."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:416
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:463
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:79
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:410
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:467
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -1977,23 +2246,23 @@
 "<br>Wenn Sie die GPX-Tracks hochladen wollen sollten Sie hier schauen:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:80
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:411
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:468
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:387
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:483
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertiert von: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:100
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
 msgid "Upload this trace..."
 msgstr "Diesen Track hochladen ...."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:104
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid ""
 "<html>This functionality has been added only recently. Please<br>use with "
@@ -2003,41 +2272,41 @@
 "prüfen ob es wie erwartet funktioniert.</html>"
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:363
 msgid "Upload track filtered by JOSM"
 msgstr "Track durch JOSM gefiltert hochladen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:112
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103
 #, java-format
 msgid "Upload raw file: {0}"
 msgstr "Rohdaten hochladen: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:117
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:307
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
 msgid "Upload raw file: "
 msgstr "Rohdaten hochladen: "
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:130
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:132
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:328
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
 msgid "GPX-Upload"
 msgstr "GPX-Upload"
 
-#: ../../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
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:448
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:232
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:274
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:265
 msgid "track"
 msgid_plural "tracks"
@@ -2045,5 +2314,5 @@
 msgstr[1] "Tracks"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:275
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:266
 msgid "point"
 msgid_plural "points"
@@ -2051,5 +2320,5 @@
 msgstr[1] "Punkte"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:300
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:291
 #, java-format
 msgid "a track with {0} point"
@@ -2058,5 +2327,5 @@
 msgstr[1] "Ein Track mit {0} Punkten"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:295
 #, java-format
 msgid "{0} consists of {1} track"
@@ -2065,5 +2334,5 @@
 msgstr[1] "{0} besteht aus {1} Tracks"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:295
 #, java-format
 msgid "{0} point"
@@ -2072,26 +2341,26 @@
 msgstr[1] "{0} Punkte"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:308
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:87
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:299
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:312
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:91
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:303
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:97
 msgid "Use global settings."
 msgstr "Globale Einstellungen benutzen."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:313
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:92
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:304
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:98
 msgid "Draw lines between points for this layer."
 msgstr "Zeichne Linien zwischen Punkten dieser Ebene."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:314
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:93
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:305
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:99
 msgid "Do not draw lines between points for this layer."
 msgstr "Zeichne keine Linien zwischen Punkten dieser Ebene."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:105
+#: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:317
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
 msgid "Select line drawing options"
 msgstr "Wähle Linienausehen"
@@ -2111,5 +2380,5 @@
 msgstr "({0} gelöscht.)"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:380
+#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 msgid "Convert to GPX layer"
 msgstr "Zur GPX-Ebene konvertieren"
@@ -2182,5 +2451,5 @@
 
 #: ../../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:417
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:202
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-Bilder (*.jpg)"
@@ -2217,9 +2486,22 @@
 msgstr "Die eingegebene Zeit ist nicht maschinenlesbar."
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#, fuzzy, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Wegpunkte von {0}"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+msgid "Make Sampled Audio Layer"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:259
 #, java-format
 msgid "{0} track, "
@@ -2228,5 +2510,5 @@
 msgstr[1] "{0} Tracks, "
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:261
 #, java-format
 msgid "{0} route, "
@@ -2235,5 +2517,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "{0} waypoint"
@@ -2242,17 +2524,22 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:268
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:217
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:272
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschreibung: {0}"
 
-#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:322
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 msgid "Tags (keywords in GPX):"
 msgstr "Tags (Schlüsselworte in GPX):"
+
+#: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:510
+#, fuzzy, java-format
+msgid "Sampled audio markers from {0}"
+msgstr "Wegpunkte von {0}"
 
 #: ../../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
@@ -2264,10 +2551,10 @@
 msgstr "Kann Lesezeichen nicht schreiben."
 
-#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:112
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:130
 #: ../../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Java OpenStreetMap - Editor"
 msgstr "Java OpenStreetMap - Editor"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:157
+#: ../../core/src/org/openstreetmap/josm/gui/MapView.java:175
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
@@ -2342,9 +2629,9 @@
 msgstr "Anstatt --download<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:97
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:111
 msgid "File"
 msgstr "Datei"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:99
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:113
 #: ../osmarender/src/OsmarenderPlugin.java:91
 #: ../osmarender/src/OsmarenderPlugin.java:97
@@ -2352,15 +2639,19 @@
 msgstr "Anzeigen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:100
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:29
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:114
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:31
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:101
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:115
+msgid "Audio"
+msgstr ""
+
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:116
 msgid "Presets"
 msgstr "Vorlagen"
 
-#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 msgid "Wireframe view"
 msgstr "Drahtdarstellung"
@@ -2374,5 +2665,5 @@
 msgstr "Breite/Länge"
 
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:226
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
 #, java-format
 msgid "{0} object has conflicts:"
@@ -2381,13 +2672,13 @@
 msgstr[1] "{0} Objekte haben Konflikte:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:229
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
 msgid "my version:"
 msgstr "meine Version:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:235
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
 msgid "their version:"
 msgstr "deren Version:"
 
-#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:241
+#: ../../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
 msgid "resolved version:"
 msgstr "neue Version:"
@@ -2433,7 +2724,7 @@
 "referring to 0.4.</h3></html>"
 msgstr ""
-"<html><h3>Die Einstellungen wurden geändert. Es wurde <b>osm-server."
-"version</b> und/oder<b>osm-server.additional-versions</b> entfernt, weil "
-"diese auf die Version 0.4 verwiesen haben.</h3></html>"
+"<html><h3>Die Einstellungen wurden geändert. Es wurde <b>osm-server.version</"
+"b> und/oder<b>osm-server.additional-versions</b> entfernt, weil diese auf "
+"die Version 0.4 verwiesen haben.</h3></html>"
 
 #: ../../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
@@ -2523,5 +2814,6 @@
 #: ../../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."
+msgstr ""
+"Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
 
 #: ../../core/src/org/openstreetmap/josm/gui/MainApplet.java:83
@@ -2535,8 +2827,4 @@
 msgstr "Passwort"
 
-#: ../../core/src/org/openstreetmap/josm/io/GpxReader.java:262
-msgid "Parse error: invalid document structure for gpx document"
-msgstr "Fehler beim Parsen: ungültige Dokumentstruktur für ein GPX Dokument"
-
 #: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:129
 #: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:131
@@ -2544,45 +2832,49 @@
 msgstr "Version unbekannt."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:159
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:160
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:162
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:163
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 msgid "Found <member> tag on non-relation."
 msgstr "Habe <member> Tag auf einer Nicht-Relation gefunden."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:182
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:183
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member> Beschreibung mit ref=0"
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:196
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:197
 msgid "NullPointerException, Possibly some missing tags."
 msgstr "NullPointerException, vielleicht fehlende Tags."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:225
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:226
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:266
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Erforderliches Attribut \"{0}\" nicht gefunden."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:406
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:407
 msgid "Preparing data..."
 msgstr "Bereite Daten vor ...."
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:417
+#: ../../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 msgid "Illformed Node id"
 msgstr "Falsch formatierte Knotenpunkt-Id"
 
-#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
-#, java-format
-msgid "Upload {0} {1} ({2})..."
+#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:97
+#, fuzzy, java-format
+msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
 msgstr "Überspiele {0} {1} ({2})..."
+
+#: ../../core/src/org/openstreetmap/josm/io/GpxReader.java:287
+msgid "Parse error: invalid document structure for gpx document"
+msgstr "Fehler beim Parsen: ungültige Dokumentstruktur für ein GPX Dokument"
 
 #: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
@@ -2644,12 +2936,26 @@
 msgstr "Position"
 
-#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:76
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:73
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:97
+#, fuzzy
+msgid "incomplete"
+msgstr "unvollständiger Weg"
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:85
+#, fuzzy, java-format
+msgid " ({0} node)"
+msgid_plural " ({0} nodes)"
 msgstr[0] "{0} Knotenpunkt"
 msgstr[1] "{0} Knotenpunkte"
 
-#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:93
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:109
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:113
 msgid "relation"
 msgid_plural "relations"
@@ -2679,8 +2985,4 @@
 msgid "Change"
 msgstr "Ändere"
-
-#: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
-msgid "Move"
-msgstr "Verschiebe"
 
 #: ../../core/src/org/openstreetmap/josm/command/SequenceCommand.java:60
@@ -2709,15 +3011,15 @@
 msgstr "Drehen"
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:228
+#: ../../core/src/org/openstreetmap/josm/Main.java:237
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin nicht gefunden: {0}."
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:256
-#, java-format
-msgid "Could not load plugin {0}. Deleted from preferences."
+#: ../../core/src/org/openstreetmap/josm/Main.java:267
+#, fuzzy, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Kann das Plugin {0} nicht laden. Aus den Einstellungen gelöscht."
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:323
+#: ../../core/src/org/openstreetmap/josm/Main.java:341
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -2725,22 +3027,23 @@
 "EPSG:4263."
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:393
+#: ../../core/src/org/openstreetmap/josm/Main.java:411
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
-
-#: ../../core/src/org/openstreetmap/josm/Main.java:395
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Übertragen zum Server enstanden."
+
+#: ../../core/src/org/openstreetmap/josm/Main.java:413
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und wirklich beenden?"
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:396
+#: ../../core/src/org/openstreetmap/josm/Main.java:414
 msgid "Unsaved Changes"
 msgstr "Daten nicht gespeichert"
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:408
+#: ../../core/src/org/openstreetmap/josm/Main.java:426
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ingnoriere die ungültige URL: \"{0}\""
 
-#: ../../core/src/org/openstreetmap/josm/Main.java:421
+#: ../../core/src/org/openstreetmap/josm/Main.java:439
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -2774,71 +3077,93 @@
 msgstr "Vereinfache Weg (entferne {0} Knoten)"
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:42
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:56
 msgid "Lake Walker."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:120
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:116
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerActionOld.java:122
 #, fuzzy
 msgid "Tracing"
 msgstr "Zeichenkette"
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:24
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:252
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:136
+msgid "Lakewalker trace"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:25
 msgid "Lake Walker"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:31
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:26
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerActionOld.java:42
+msgid "Lake Walker (Old)"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:34
 msgid "Python executable"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:33
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:36
 #, 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
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:38
+#, fuzzy
 msgid "Maximum number of nodes in initial trace"
-msgstr ""
-
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:37
+msgstr "Zeige die Ordnungsnummer für alle Segmente innerhalb des Weges."
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+msgid "Maximum gray value to count as water (0-255) [For old script]"
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:39
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Tag ways as"
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#, fuzzy
+msgid "WMS Layer"
+msgstr "Ebenen"
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "Path to python executable."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#, fuzzy
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr ""
-
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+msgstr "Zeige die Ordnungsnummer für alle Segmente innerhalb des Weges."
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -2846,5 +3171,5 @@
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -2852,5 +3177,11 @@
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -2858,29 +3189,34 @@
 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
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr ""
+
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 #, java-format
 msgid ""
@@ -2889,11 +3225,8 @@
 msgstr ""
 
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#, fuzzy
 msgid "Lakewalker Plugin Preferences"
-msgstr ""
-
-#: ../lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:116
-msgid "Lakewalker trace"
-msgstr ""
+msgstr "Einstellungen für WMS Plugin"
 
 #: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
@@ -2903,5 +3236,6 @@
 
 #: ../tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:20
-msgid "Open the tagging preset test tool for previewing tagging preset dialogs."
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
@@ -2934,6 +3268,7 @@
 
 #: ../grid/src/grid/GridLayer.java:200
+#, fuzzy
 msgid "Grid layout"
-msgstr ""
+msgstr "Raster Ebene:"
 
 #: ../grid/src/grid/GridLayer.java:222
@@ -2943,9 +3278,13 @@
 #: ../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."
+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."
+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
@@ -3011,51 +3350,48 @@
 msgstr "Knoten ohne Zusatzinformation oder ohne Verbindung"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:16
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:17
 msgid "Duplicated way nodes."
 msgstr "Doppelte Knoten im Weg."
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:17
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:18
 msgid "Checks for ways with identical consecutive nodes."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:30
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:31
 #, 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
+#, fuzzy
 msgid "Similar named ways."
-msgstr ""
+msgstr "Unbenannte Wege"
 
 #: ../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."
+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
+#, fuzzy
 msgid "Similar named ways"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:32
+msgstr "Unbenannte Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:34
+#, fuzzy
 msgid "Overlapping ways."
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:33
+msgstr "Verbinde {0} Wege"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:35
+#, fuzzy
 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
+msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:57
+#, fuzzy
 msgid "Overlapping ways"
-msgstr ""
+msgstr "Verbinde {0} Wege"
 
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:31
@@ -3070,5 +3406,5 @@
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:92
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:89
 #, fuzzy
 msgid "Crossing ways"
@@ -3097,6 +3433,7 @@
 
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:239
+#, fuzzy
 msgid "Invalid property keys"
-msgstr ""
+msgstr "Einstellungen ändern"
 
 #: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:247
@@ -3105,23 +3442,23 @@
 msgstr "Unbekannter Typ"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:255
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:256
 msgid "FIXMES"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:363
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:364
 #, fuzzy
 msgid "Check property keys."
 msgstr "Einstellungen ändern"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:364
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:365
 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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:384
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:397
 msgid "Spellcheck source"
 msgstr "Quelle für Rechtschreibüberprüfung"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:416
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:417
 #, fuzzy
 msgid ""
@@ -3132,50 +3469,76 @@
 "openstreetmap.de/wiki/TaggingPresets für Hilfe."
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:417
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:418
 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
+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:419
 #, fuzzy
 msgid "Edit the selected source."
 msgstr "Ausgewählte Ebene löschen."
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:421
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:422
 msgid "Spellcheck data sources"
 msgstr "Quelle für Rechtschreibüberprüfungsdaten"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:445
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:446
 #, fuzzy
 msgid "Check property values."
 msgstr "Einstellungen ändern"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:446
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:447
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:454
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:455
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:455
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java:456
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:79
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:19
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:31
+msgid "Self-intersecting ways"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:20
+#, fuzzy
+msgid ""
+"This test checks for ways that contain some of their nodes more than once"
+msgstr "Dieser Test überprüft ob die Küsten korrekt sind."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:32
+msgid "Wrongly Ordered Ways."
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:33
+#, fuzzy
+msgid "This test checks the direction of water, land and coastline ways."
+msgstr "Dieser Test überprüft ob die Küsten korrekt sind."
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:19
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:45
+msgid "Nodes with same name"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:20
+msgid ""
+"Find nodes that have the same name (might be duplicates due to e.g. the "
+"OpenGeoDB import)"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:76
 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
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:85
 msgid "Grid"
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:220
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:225
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:190
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:195
 #, fuzzy, java-format
 msgid ""
@@ -3184,5 +3547,5 @@
 msgstr "Fehler beim Parsen {0}:"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:60
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:65
 msgid ""
 "A OSM data validator that checks for common errors made by users and editor "
@@ -3190,5 +3553,5 @@
 msgstr ""
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:62
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:67
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/YWMSPreferenceSetting.java:55
 #, fuzzy, java-format
@@ -3196,59 +3559,62 @@
 msgstr "Letzte Änderung am {0}"
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:63
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:68
+#, fuzzy
 msgid "Data validator"
-msgstr ""
-
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:60
+msgstr "Navigator"
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:61
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:101
+msgid "Validation errors"
+msgstr ""
+
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:61
 #, fuzzy
 msgid "Open the validation window."
 msgstr "Öffne ein Fenster mit der aktuellen Auswahl."
 
-#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:101
+#: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
 msgid "No validation errors"
 msgstr ""
 
-#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:23
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:22
 #, fuzzy
 msgid "Downloading "
 msgstr "Lade Daten aus dem Internet"
 
-#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:38
+#: ../wmsplugin/src/wmsplugin/DownloadWMSTask.java:30
 #, 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
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:72
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:143
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:120
 msgid "Save WMS layer to file"
 msgstr "Speichere WMS-Ebene in Datei"
 
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:142
 msgid "Load WMS layer from file"
 msgstr "Lade WMS-Ebene aus Datei"
 
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:175
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:153
 #, 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
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:154
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../wmsplugin/src/wmsplugin/WMSLayer.java:191
+#: ../wmsplugin/src/wmsplugin/WMSLayer.java:169
 #, fuzzy
 msgid "Error loading file"
 msgstr "Fehler bei der Klang Ausgabe."
 
-#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:98
+#: ../wmsplugin/src/wmsplugin/WMSPlugin.java:97
 msgid "WMS"
 msgstr "WMS"
@@ -3295,6 +3661,7 @@
 
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:124
+#, fuzzy
 msgid "Check Site(s)"
-msgstr ""
+msgstr "Löschen"
 
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:128
@@ -3313,6 +3680,7 @@
 
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:154
+#, fuzzy
 msgid "Check the selected site(s) for new plugins or updates."
-msgstr ""
+msgstr "Ausgewählte Quelle löschen."
 
 #: ../pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:156
@@ -3344,5 +3712,6 @@
 #: ../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."
+msgstr ""
+"Setze Anfang/Ende für Routenberechnung. Zurücksetzen mit mittlerer Maustaste."
 
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -3358,6 +3727,7 @@
 
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
+#, fuzzy
 msgid "Can't duplicate unnordered way."
-msgstr ""
+msgstr "Ausgewählte Ebene löschen."
 
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
@@ -3367,6 +3737,7 @@
 
 #: ../duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
+#, fuzzy
 msgid "Create duplicate way"
-msgstr ""
+msgstr "Verdoppeln"
 
 #: ../waypoints/src/WaypointOpenAction.java:33
@@ -3411,6 +3782,7 @@
 
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:61
+#, fuzzy
 msgid "SurveyorPlugin"
-msgstr ""
+msgstr "Suche ..."
 
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
@@ -3443,6 +3815,7 @@
 
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:107
+#, fuzzy
 msgid "Surveyor"
-msgstr ""
+msgstr "Suche ..."
 
 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:136
@@ -3472,5 +3845,6 @@
 
 #: ../ywms/src/org/openstreetmap/josm/plugins/ywms/GeckoSupport.java:57
-msgid "Could not start browser. Please check that the executable path is correct."
+msgid ""
+"Could not start browser. Please check that the executable path is correct."
 msgstr ""
 
@@ -3536,5 +3910,6 @@
 #, 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."
+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
@@ -3552,6 +3927,7 @@
 
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#, fuzzy
 msgid "Color Scheme"
-msgstr ""
+msgstr "Farben"
 
 #: ../colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:97
@@ -3603,20 +3979,21 @@
 msgstr ""
 
-#: ../livegps/livegps/LiveGpsAcquirer.java:95
-#: ../livegps/livegps/LiveGpsAcquirer.java:111
+#: ../livegps/livegps/LiveGpsAcquirer.java:128
+#: ../livegps/livegps/LiveGpsAcquirer.java:144
 #, fuzzy
 msgid "Connecting"
 msgstr "Verbindungseinstellungen"
 
-#: ../livegps/livegps/LiveGpsAcquirer.java:170
+#: ../livegps/livegps/LiveGpsAcquirer.java:204
+#, fuzzy
 msgid "Connected"
-msgstr ""
-
-#: ../livegps/livegps/LiveGpsAcquirer.java:182
-#: ../livegps/livegps/LiveGpsAcquirer.java:197
+msgstr "Verbindungseinstellungen"
+
+#: ../livegps/livegps/LiveGpsAcquirer.java:216
+#: ../livegps/livegps/LiveGpsAcquirer.java:232
 msgid "Not connected"
 msgstr ""
 
-#: ../livegps/livegps/LiveGpsAcquirer.java:191
+#: ../livegps/livegps/LiveGpsAcquirer.java:225
 #, fuzzy
 msgid "Connection Failed"
@@ -3678,2 +4055,7 @@
 msgstr ""
 
+#~ 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."
