Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 26406)
+++ applications/editors/josm/i18n/po/de.po	(revision 26428)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
-"PO-Revision-Date: 2011-07-22 09:20+0000\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"PO-Revision-Date: 2011-07-31 10:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:38+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:48+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -77,5 +77,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:745
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
@@ -164,5 +164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
@@ -403,5 +403,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:443
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -1224,5 +1224,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
-#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
@@ -1471,5 +1471,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 msgid "URL"
@@ -2472,5 +2472,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
@@ -8213,5 +8213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:478
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:223
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:231
 msgid "Reloading style sources"
 msgstr "Stilquellen neu laden"
@@ -9707,5 +9707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -12753,16 +12753,16 @@
 msgstr "Farben anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
@@ -12772,6 +12772,6 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
@@ -12781,5 +12781,5 @@
 msgstr "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
 #, java-format
@@ -12791,5 +12791,5 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
@@ -12801,16 +12801,16 @@
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 msgid "Timespan"
 msgstr "Zeitraum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 msgid "Length"
 msgstr "Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
@@ -12819,6 +12819,6 @@
 msgstr "Länge: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
@@ -12829,6 +12829,6 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
@@ -12839,11 +12839,11 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
 msgid "gps point"
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
 #, java-format
@@ -12853,10 +12853,10 @@
 msgstr[1] "{0} GPS-Spuren, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:742
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12866,10 +12866,10 @@
 "<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:744
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:767
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -12880,7 +12880,7 @@
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:789
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -12891,5 +12891,5 @@
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
@@ -12897,5 +12897,5 @@
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
@@ -12904,5 +12904,5 @@
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
@@ -12910,5 +12910,5 @@
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
@@ -12917,25 +12917,25 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
 msgid "Download near:"
 msgstr "Herunterladen nahe bei:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "track only"
 msgstr "Nur GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "waypoints only"
 msgstr "Nur Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "track and waypoints"
 msgstr "GPS-Spur und Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
@@ -12948,5 +12948,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
 msgid "No GPX track available in layer to associate audio with."
@@ -12955,5 +12955,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
 msgid ""
@@ -12964,5 +12964,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1221
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
 msgid ""
@@ -12973,35 +12973,15 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Linienaussehen anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Globale Einstellungen verwenden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
-msgid "Draw lines between points for this layer."
-msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
-msgid "Do not draw lines between points for this layer."
-msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1423
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+msgid "Customize track drawing"
+msgstr "Spur-Anzeige anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1439
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
 #, java-format
@@ -13009,10 +12989,10 @@
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1451
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1456
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
 #, java-format
@@ -13026,6 +13006,6 @@
 "Audiodaten verknüpft werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1463
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1553
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
@@ -13033,10 +13013,10 @@
 msgstr "Import nicht möglich"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1487
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1522
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
 #, java-format
@@ -13044,10 +13024,10 @@
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1541
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1546
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
 #, java-format
@@ -13874,5 +13854,5 @@
 msgstr "Fehler beim Anzeigen der URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:191
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:199
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:70
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77
@@ -13884,5 +13864,5 @@
 "Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:252
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:260
 #, java-format
 msgid "loading style ''{0}''..."
@@ -14935,5 +14915,106 @@
 msgstr "Farben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+msgid "Draw Direction Arrows"
+msgstr "Richtungspfeile zeichnen"
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+msgid "Only on the head of a way."
+msgstr "Nur am Ende der Linie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Einbahnstraßenpfeile zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Ordnungsnummer des Abschnitts anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Virtuelle Punkte im Auswahlmodus zeichnen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Nur Außenlinie von Flächen zeichnen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-Punkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Richtungspfeile für Linienabschnitte zeichnen."
+
+#. draw oneway arrows
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+msgid "Draw arrows in the direction of oneways and other directed features."
+msgstr ""
+"Einbahnstraßenpfeile in Fahrtrichtung und andere gerichtete Eigenschaften "
+"einzeichnen."
+
+#. segment order number
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+msgid "Draw the order numbers of all segments within their way."
+msgstr "Ordnungsnummer für alle Abschnitte innerhalb der Linie anzeigen."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Anti-Aliasing in der Kartenanzeige nutzen, um ein gefälligeres Aussehen zu "
+"erreichen."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Im Auswahlmodus virtuelle Punkte zeichnen, um das Ändern von Linien zu "
+"vereinfachen."
+
+#. background layers in inactive color
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+msgid "Draw the inactive data layers in a different color."
+msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+msgid ""
+"This option suppresses the filling of areas, overriding anything specified "
+"in the selected style."
+msgstr ""
+"Diese Option unterdrückt die Füllung von Bereichen, vorrangig vor allem "
+"anderen im ausgewählten Stil."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-Daten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+msgid "Use global settings."
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14944,10 +15025,10 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
@@ -14956,31 +15037,36 @@
 msgstr "Keine"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
 msgid "Force lines if no segments imported."
 msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
 msgid "Draw large GPS points."
 msgstr "Große GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#. hdopCircleGpsPoints
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
 msgid "Draw a circle form HDOP value."
 msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr "Richtung (Rot = West, Gelb = Nord, Grün = Ost, Blau = Süd)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr "Datum der Spur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -14988,5 +15074,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15010,5 +15096,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15051,5 +15137,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15063,61 +15149,22 @@
 msgstr "Zu Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
-msgid "Draw Direction Arrows"
-msgstr "Richtungspfeile zeichnen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+msgid "Create markers when reading GPX."
+msgstr "Marken beim Einlesen von GPX erstellen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
-msgid "Only on the head of a way."
-msgstr "Nur am Ende der Linie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Einbahnstraßenpfeile zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Ordnungsnummer des Abschnitts anzeigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Virtuelle Punkte im Auswahlmodus zeichnen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Marken beim Einlesen von GPX erstellen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Nur Außenlinie von Flächen zeichnen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Dynamic color range based on data limits"
 msgstr "Dynamischer Farbbereich basierend auf den Datengrenzwerten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automatisch"
 
 #. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgctxt "gpx_field"
 msgid "Name"
@@ -15125,14 +15172,15 @@
 
 #. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgctxt "gpx_field"
 msgid "Desc(ription)"
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Beide"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
+#. makeAutoMarkers
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15142,9 +15190,11 @@
 "geöffnet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#. ensure that default is in data base
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
 msgid "Draw lines between raw GPS points"
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#. drawRawGpsMaxLineLengthLocal
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15154,9 +15204,10 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#. drawRawGpsMaxLineLength
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15165,10 +15216,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:126
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15177,11 +15228,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15190,5 +15240,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15197,13 +15247,14 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:167
+#. largeGpsPoints
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:204
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15213,13 +15264,13 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:205
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Colors points and track segments by direction."
 msgstr "Färbt Punkte und Wegabschnitte anhand der Fahrtrichtung."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15229,5 +15280,10 @@
 "Ihr GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+msgid "Colors points and track segments by its timestamp."
+msgstr "Punkte und Wegabschnitte anhand des Zeitstempels färben."
+
+#. color Tracks by Velocity Tune
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -15235,67 +15291,20 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:217
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+msgid "Colors points and track segments by data limits."
+msgstr ""
+"Färbung der Punkte und Wegabschnitte mittels der Datengrenzwerte anpassen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Wegpunkt-Beschriftung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-Punkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Richtungspfeile für Linienabschnitte zeichnen."
-
-#. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
-msgid "Draw arrows in the direction of oneways and other directed features."
-msgstr ""
-"Einbahnstraßenpfeile in Fahrtrichtung und andere gerichtete Eigenschaften "
-"einzeichnen."
-
-#. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:269
-msgid "Draw the order numbers of all segments within their way."
-msgstr "Ordnungsnummer für alle Abschnitte innerhalb der Linie anzeigen."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Anti-Aliasing in der Kartenanzeige nutzen, um ein gefälligeres Aussehen zu "
-"erreichen."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Im Auswahlmodus virtuelle Punkte zeichnen, um das Ändern von Linien zu "
-"vereinfachen."
-
-#. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:289
-msgid "Draw the inactive data layers in a different color."
-msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:295
-msgid ""
-"This option suppresses the filling of areas, overriding anything specified "
-"in the selected style."
-msgstr ""
-"Diese Option unterdrückt die Füllung von Bereichen, vorrangig vor allem "
-"anderen im ausgewählten Stil."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-Daten"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr "Globale Einstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17237,27 +17246,28 @@
 "verwendet: {1}"
 
+#. I18n: argument is HTTP response code
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:300
 #, java-format
 msgid ""
-"Fatal: unexpected response from HTTP server. Got {0} response without "
-"'Location' header. Can''t redirect. Aborting."
-msgstr ""
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
+msgstr ""
+"Unerwartete Antwort vom HTTP-Server. Antwort vom Typ {0} enthält keinen "
+"''Location''-Kopf. Weiterleitung nicht möglich. Abbruch."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgid "Too many redirects to the download URL detected. Aborting."
+msgstr ""
+"Zu viele Weiterleitungen für die URL zum Herunterladen gefunden. Abbruch."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Relation ''{0}'' herunterladen"
+msgstr "Herunterladen umgelenkt auf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
-#, fuzzy, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
-msgstr ""
-"Warnung: die Nachricht des Tages konnte nicht von ''{0}'' gelesen werden. "
-"Fehlermeldung war: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr "Fehler beim Lesen von ''{0}''. Server antwortete mit Statuswert {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -19094,5 +19104,6 @@
 "genutzt."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:95
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82
+#: ../core/src/org/openstreetmap/josm/tools/ImageRequest.java:81
 #, java-format
 msgid ""
@@ -19103,5 +19114,5 @@
 "schwerwiegendes Konfigurationsproblem."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:290
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19109,6 +19120,6 @@
 "Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:347
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:361
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:340
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:354
 #, java-format
 msgid ""
@@ -37107,9 +37118,9 @@
 msgstr "Unvollständige Adressen anzeigen"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
 msgid "items"
 msgstr "Elemente"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "no items"
 msgstr "keine Einträge"
@@ -37212,5 +37223,5 @@
 msgstr "Alle Adressen mit fehlenden Daten auswählen."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
 msgid "Layer Properties"
 msgstr "Ebenen-Eigenschaften"
@@ -38246,7 +38257,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Automatischen Zwischenspeicher aktivieren."
+msgstr "Automatisches Zwischenspeichern ermöglichen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38352,7 +38362,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Derzeitigen Zugriff abbrechen (nur Vektorbilder)"
+msgstr "Aktuellen Ladevorgang abbrechen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38552,5 +38561,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:21
 msgid "Save image as PNG"
-msgstr ""
+msgstr "Bild als PNG speichern"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:38
@@ -39054,4 +39063,20 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Linienaussehen anpassen"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Linienaussehen wählen"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39692,28 +39717,22 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Diesen Button verbergen"
+msgstr "Ausblenden"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Diesen Button verbergen"
+msgstr "Dies und älteres ausblenden"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
 msgid "No timestamp"
-msgstr ""
+msgstr "Kein Zeitstempel"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
-msgstr ""
-"\n"
-"{0} km/h"
+msgstr "km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Feldweg Grad 1 (asphaltiert)"
+msgstr "Spur-Name: "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40447,4 +40466,5 @@
 msgid "Transfer to password manager and remove from prefence file"
 msgstr ""
+"Zur Passwortverwaltung transferieren und aus Einstellungsdatei entfernen"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
@@ -41350,5 +41370,5 @@
 
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:108
-#: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:246
+#: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:247
 #, java-format
 msgid "Selected: {0}"
@@ -41356,5 +41376,5 @@
 
 #. TODO: include description in string
-#: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:210
+#: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:211
 msgid "Proj4J: "
 msgstr "Proj4J: "
@@ -43886,14 +43906,13 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:85
 msgid "Symmetry"
-msgstr ""
+msgstr "Symmetrie"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Bitte wählen Sie mindestens zwei Punkte zum Vereinigen oder einen Punkt, der "
-"nahe an einem anderen liegt."
+"Bitte mindestens zwei Punkte für die Symmetrieachse und etwas anderes zum "
+"Spiegeln auswählen."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44433,7 +44452,4 @@
 msgid "Drive a race car on this layer"
 msgstr "Ein Rennauto auf dieser Ebene fahren"
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Löschen und zu Passwortverwaltung übertragen"
 
 #~ msgid "Move"
@@ -44892,4 +44908,7 @@
 #~ msgid "Footway"
 #~ msgstr "Fußweg"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Feldweg Grad 1 (asphaltiert)"
 
 #~ msgid "Track Grade 2"
@@ -49399,4 +49418,7 @@
 #~ msgstr "UTM20-Nord Geodätisches System"
 
+#~ msgid "Downloading relation ''{0}''"
+#~ msgstr "Relation ''{0}'' herunterladen"
+
 #~ msgid "Could not create a node with the entered latitude/longitude."
 #~ msgstr ""
@@ -51973,2 +51995,22 @@
 #~ "Das \"Tableau(x) d’assemblage\" in die Liste der zu holenden "
 #~ "Katasterseiten aufnehmen."
+
+#~ msgid "Erase and transfer to password manager"
+#~ msgstr "Löschen und zu Passwortverwaltung übertragen"
+
+#~ msgid ""
+#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
+#~ "'Location' header. Can''t redirect. Aborting."
+#~ msgstr ""
+#~ "Fatal: Unerwartete Rückmeldung von HTTP-Server. {0}-Rückmeldung ohne "
+#~ "'Standort'-Kopfdaten. Weiterleitung kann nicht durchgeführt werden. "
+#~ "Abbruch."
+
+#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
+#~ msgstr "Fatal: Zu viele Weiterleitungen zur Download-URL erkannt. Abbruch."
+
+#~ msgid ""
+#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
+#~ msgstr ""
+#~ "Fehler: Lesen von ''{0}'' fehlgeschlagen. Server antwortete mit dem "
+#~ "Statuscode {1}."