Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 26406)
+++ applications/editors/josm/i18n/po/ar.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2010-12-30 18:13+0000\n"
 "Last-Translator: Hsn <hh.alshawaf@gmail.com>\n"
@@ -18,6 +18,6 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:23+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:33+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -78,5 +78,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
@@ -162,5 +162,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
@@ -394,5 +394,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
@@ -1195,5 +1195,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
@@ -1421,5 +1421,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"
@@ -2359,5 +2359,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
@@ -7750,5 +7750,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 ""
@@ -9222,5 +9222,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
@@ -11992,16 +11992,16 @@
 msgstr "خصّص اللون"
 
-#: ../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 "الغيابي"
 
-#: ../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 "إختر لون"
 
-#: ../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
@@ -12011,6 +12011,6 @@
 msgstr "الإسم: {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
@@ -12020,5 +12020,5 @@
 msgstr "الوصف: {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
@@ -12030,5 +12030,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
@@ -12040,16 +12040,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12058,6 +12058,6 @@
 msgstr ""
 
-#: ../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
@@ -12068,6 +12068,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -12078,11 +12078,11 @@
 msgstr[1] ""
 
-#: ../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"
 
-#: ../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
@@ -12092,10 +12092,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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."
@@ -12103,10 +12103,10 @@
 msgstr ""
 
-#: ../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
@@ -12117,7 +12117,7 @@
 msgstr "محوّل من: {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
@@ -12128,5 +12128,5 @@
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../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
@@ -12134,5 +12134,5 @@
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../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
@@ -12141,5 +12141,5 @@
 msgstr "{0} أمتار"
 
-#: ../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
@@ -12147,5 +12147,5 @@
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../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
@@ -12154,25 +12154,25 @@
 msgstr "{0} كلم²"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12183,10 +12183,10 @@
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
@@ -12195,5 +12195,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12202,35 +12202,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "إستعمل الإعدادات العامة."
-
-#: ../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 "أرسم خطوط بين النقاط لهذه الطبقة."
-
 #: ../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 "لا ترسم خطوط بين النقاط لهذه الطبقة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "حدد خيارات رسم الخطوط"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12238,10 +12218,10 @@
 msgstr ""
 
-#: ../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 "إستورد صوت مسجل"
 
-#: ../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
@@ -12252,6 +12232,6 @@
 msgstr ""
 
-#: ../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
@@ -12259,10 +12239,10 @@
 msgstr ""
 
-#: ../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 "ملفات صوتيت (*.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
@@ -12270,10 +12250,10 @@
 msgstr "العلامات الصوتية من {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 "إستورد صور"
 
-#: ../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
@@ -13051,5 +13031,5 @@
 msgstr ""
 
-#: ../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
@@ -13059,5 +13039,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -13979,5 +13959,98 @@
 msgstr "الألوان"
 
-#: ../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 "أرسم أسهم الإتجاه"
+
+#. 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 "فقط على رأس الطريق."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "نقاط جهاز تحديد المواقع العالمي"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "المعطيات أو.أس.أم"
+
+#: ../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 "إستعمل الإعدادات العامة."
+
+#: ../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
@@ -13988,10 +14061,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14000,30 +14073,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../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 ""
 
-#: ../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 "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../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 ""
 
-#: ../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 "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14031,5 +14109,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"
@@ -14053,5 +14131,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
@@ -14094,5 +14172,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
@@ -14106,61 +14184,22 @@
 msgstr "المشي"
 
-#: ../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 "أرسم أسهم الإتجاه"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
-#. 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 "فقط على رأس الطريق."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14168,14 +14207,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14183,9 +14223,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14193,30 +14235,30 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "الطول الأقصى (أمتار)"
 
 #. 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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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 ""
@@ -14224,5 +14266,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 "
@@ -14230,13 +14272,14 @@
 msgstr ""
 
-#: ../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 "المسافة الأدنى (نقاط)"
 
-#: ../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 "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../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 "
@@ -14244,13 +14287,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14258,63 +14301,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 "تلوين الأثر و النقطة"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "نقاط جهاز تحديد المواقع العالمي"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "المعطيات أو.أس.أم"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16100,13 +16108,14 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
@@ -16118,6 +16127,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17732,5 +17740,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17739,11 +17748,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35591,9 +35600,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35692,5 +35701,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36606,7 +36615,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "تمكين الإخباء التلقائي"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37362,4 +37370,20 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "حدد خيارات رسم الخطوط"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -37974,7 +37998,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "مخبئ"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -39568,5 +39591,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}"
@@ -39574,5 +39597,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 ""
@@ -41968,9 +41991,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42535,4 +42557,7 @@
 #~ msgid "Those nodes are not in a circle."
 #~ msgstr "هذه العقد ليست في مستديرة."
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
 
 #~ msgid "Merge nodes with different memberships?"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 26406)
+++ applications/editors/josm/i18n/po/bg.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:23+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:34+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
@@ -165,5 +165,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
@@ -399,5 +399,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
@@ -1208,5 +1208,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
@@ -1440,5 +1440,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"
@@ -2403,5 +2403,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
@@ -7846,5 +7846,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 ""
@@ -9322,5 +9322,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
@@ -12123,16 +12123,16 @@
 msgstr "Избор цвят"
 
-#: ../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 "По подразбиране"
 
-#: ../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 "Изберете цвят"
 
-#: ../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
@@ -12142,6 +12142,6 @@
 msgstr "Название: {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
@@ -12151,5 +12151,5 @@
 msgstr "Описание: {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
@@ -12161,5 +12161,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
@@ -12171,16 +12171,16 @@
 msgstr "Описание"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12189,6 +12189,6 @@
 msgstr ""
 
-#: ../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
@@ -12199,6 +12199,6 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../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
@@ -12209,11 +12209,11 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../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 точка"
 
-#: ../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
@@ -12223,10 +12223,10 @@
 msgstr[1] "{0} следи, "
 
-#: ../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 "Преобразувай в слой данни"
 
-#: ../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."
@@ -12234,10 +12234,10 @@
 msgstr ""
 
-#: ../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
@@ -12248,7 +12248,7 @@
 msgstr "Преобразувано от: {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
@@ -12259,5 +12259,5 @@
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../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
@@ -12265,5 +12265,5 @@
 msgstr "Свали всичко в пределите на:"
 
-#: ../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
@@ -12272,5 +12272,5 @@
 msgstr "{0} метри"
 
-#: ../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
@@ -12278,5 +12278,5 @@
 msgstr "Максимална област за една заявка:"
 
-#: ../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
@@ -12285,25 +12285,25 @@
 msgstr "{0} кв. км."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12316,10 +12316,10 @@
 "Продължаване?</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."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../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 ""
@@ -12330,5 +12330,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../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 ""
@@ -12339,35 +12339,15 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Настройка рисуването на линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Използвай глобалните настройки."
-
-#: ../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 "Чертай линии между точките на този слой."
-
 #: ../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 "Не чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Избиране варианти за чертане на линиите."
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../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
@@ -12375,10 +12355,10 @@
 msgstr "Наименувани точки от следа от {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 "Импорт Аудио"
 
-#: ../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
@@ -12389,6 +12369,6 @@
 msgstr ""
 
-#: ../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
@@ -12396,10 +12376,10 @@
 msgstr ""
 
-#: ../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 "Wave аудио файлове (*.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
@@ -12407,10 +12387,10 @@
 msgstr "Аудио маркери от {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 "Импорт на изображения"
 
-#: ../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
@@ -13208,5 +13188,5 @@
 msgstr "Грешка показване 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
@@ -13216,5 +13196,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14151,5 +14131,100 @@
 msgstr "Цветове"
 
-#: ../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 "Изобразвай направлението със стрелки"
+
+#. 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 "Само в началото на път."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Показвай поредния номер на сегментите"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Изобразвай границите на свалените данни."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Изобразявай виртуални възли в режим на избор."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Изобразявай неактивните слоеве в друг цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Изглаждане на линиите (антиалиасинг)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS Точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Показване на направлението на сегментите на пътя."
+
+#. 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 ""
+
+#. 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 "Показване поредните номера на всички сегменти на пътя."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Приложи изглаждане върху картата."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Изобразяване границата на свалената от сървъра област."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Изобразяване виртуални точки в режим на селекция за по-удобно модифициране "
+"на пътища."
+
+#. 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 "Изобразяване неактивните слоеве с данни в други цветове."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM Данни"
+
+#: ../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 "Използвай глобалните настройки."
+
+#: ../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
@@ -14160,10 +14235,10 @@
 msgstr "Всички"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Само локални файлове"
 
-#: ../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
@@ -14172,31 +14247,36 @@
 msgstr "Никога"
 
-#: ../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 "Изобразвай линии, даже и ако не са импортирани сегменти."
 
-#: ../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 "Изобразявай големи GPS точките."
 
-#: ../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 ""
 
-#: ../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 "Скорост (червено = бавно, зелено = бързо)"
 
-#: ../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 ""
 
-#: ../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 ""
 "Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -14204,5 +14284,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"
@@ -14226,5 +14306,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
@@ -14267,5 +14347,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
@@ -14279,61 +14359,22 @@
 msgstr "Пеш"
 
-#: ../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 "Изобразвай направлението със стрелки"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
-#. 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 "Само в началото на път."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Показвай поредния номер на сегментите"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Изобразвай границите на свалените данни."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Изобразявай виртуални възли в режим на избор."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Изобразявай неактивните слоеве в друг цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Изглаждане на линиите (антиалиасинг)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14341,14 +14382,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14358,9 +14400,11 @@
 "отваряне на GPX слой."
 
-#: ../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 "Свързване с линии на GPS точките"
 
-#: ../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 "
@@ -14370,9 +14414,10 @@
 "Задайте ''-1'' за чертаене на всички линии."
 
-#: ../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 "Максимална дължина за локални файлове (метри)"
 
-#: ../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."
@@ -14381,21 +14426,20 @@
 "се рисуват всички линии."
 
-#: ../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 "Максимална дължина (в метри)"
 
 #. 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."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../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 "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. 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 ""
@@ -14404,5 +14448,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 "
@@ -14411,13 +14455,14 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../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 "Минимално разстояние (в пиксели)"
 
-#: ../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 "Рисуване на по-големи GPS точките."
 
-#: ../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 "
@@ -14427,13 +14472,13 @@
 "в мениджър слоеве."
 
-#: ../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 "Оцветяване точките от следите според скоростта."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14441,5 +14486,10 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
@@ -14447,61 +14497,19 @@
 "скорости."
 
-#: ../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 "Оцветяване на следата"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS Точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Показване на направлението на сегментите на пътя."
-
-#. 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 ""
-
-#. 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 "Показване поредните номера на всички сегменти на пътя."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Приложи изглаждане върху картата."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Изобразяване границата на свалената от сървъра област."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Изобразяване виртуални точки в режим на селекция за по-удобно модифициране "
-"на пътища."
-
-#. 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 "Изобразяване неактивните слоеве с данни в други цветове."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM Данни"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16290,24 +16298,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Сваляне на избраните релации"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17943,5 +17951,6 @@
 msgstr "Не е намерен превод за локал {0}. Връщане към {1}."
 
-#: ../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 ""
@@ -17950,11 +17959,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35840,9 +35849,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35941,5 +35950,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36867,7 +36876,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Включване автоматично кеширане."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37637,4 +37645,20 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Настройка рисуването на линии"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Чертай линии между точките на този слой."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Не чертай линии между точките на този слой."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Избиране варианти за чертане на линиите."
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38249,7 +38273,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Скриване на елементи"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38262,14 +38285,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} км/ч"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Черен път 5-ти клас"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39872,5 +39891,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}"
@@ -39878,5 +39897,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 ""
@@ -42277,9 +42296,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Моля, изберете поне две точки за обединение."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43323,4 +43341,7 @@
 #~ msgid "Portcullis"
 #~ msgstr "Падаща решетка"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Черен път 5-ти клас"
 
 #~ msgid "Track Grade 3"
@@ -44029,4 +44050,7 @@
 #~ msgstr "Създай нова карта."
 
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Моля, изберете поне две точки за обединение."
+
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Обединяване точки от различни релации?"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 26406)
+++ applications/editors/josm/i18n/po/cs.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-21 11:13+0000\n"
 "Last-Translator: Jezevec <Unknown>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:29+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:40+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
@@ -1220,5 +1220,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
@@ -1462,5 +1462,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"
@@ -2449,5 +2449,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
@@ -8018,5 +8018,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 ""
@@ -9500,5 +9500,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
@@ -12446,16 +12446,16 @@
 msgstr "Přizpůsobit barvu"
 
-#: ../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 "Výchozí"
 
-#: ../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 "Zvolit barvu"
 
-#: ../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
@@ -12465,6 +12465,6 @@
 msgstr "Jméno: {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
@@ -12474,5 +12474,5 @@
 msgstr "Popis: {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
@@ -12485,5 +12485,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
@@ -12495,16 +12495,16 @@
 msgstr "Popis"
 
-#: ../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 "Časový interval"
 
-#: ../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 "Délka"
 
-#: ../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
@@ -12513,6 +12513,6 @@
 msgstr "Délka: {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
@@ -12524,6 +12524,6 @@
 msgstr[2] "{0} trasy, "
 
-#: ../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
@@ -12535,11 +12535,11 @@
 msgstr[2] "{0} značek"
 
-#: ../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 bod"
 
-#: ../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
@@ -12550,10 +12550,10 @@
 msgstr[2] "{0} cesty, "
 
-#: ../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 "Převést do datové vrstvy"
 
-#: ../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."
@@ -12561,10 +12561,10 @@
 msgstr ""
 
-#: ../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
@@ -12575,7 +12575,7 @@
 msgstr "Převedeno z: {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
@@ -12586,5 +12586,5 @@
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../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
@@ -12592,5 +12592,5 @@
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../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
@@ -12599,5 +12599,5 @@
 msgstr "{0} metrů"
 
-#: ../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
@@ -12605,5 +12605,5 @@
 msgstr "Maximální plocha na požadavek:"
 
-#: ../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
@@ -12612,25 +12612,25 @@
 msgstr "{0} čtverečních 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 "Stáhnout poblíž:"
 
-#: ../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 "pouze trasy"
 
-#: ../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 "pouze značky"
 
-#: ../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 "trasy a značky"
 
-#: ../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
@@ -12643,10 +12643,10 @@
 "pokračovat?</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."
 msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../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 ""
@@ -12655,5 +12655,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12664,35 +12664,15 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Přizpůsobit kreslení linií"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Použít globální nastavení."
-
-#: ../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 "Kreslit spojnice mezi body v této vrstvě"
-
 #: ../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 "Nereslit spojnice mezi body v této vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../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
@@ -12700,10 +12680,10 @@
 msgstr "Pojmenované body z {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 "Importovat zvuk"
 
-#: ../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
@@ -12714,6 +12694,6 @@
 msgstr ""
 
-#: ../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
@@ -12721,10 +12701,10 @@
 msgstr "Import není možný"
 
-#: ../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 "Wave Audiosoubory (*.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
@@ -12732,10 +12712,10 @@
 msgstr "Audio značky z {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 "Importovat obrázky"
 
-#: ../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
@@ -13536,5 +13516,5 @@
 msgstr "Chyba při zobrazování 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
@@ -13544,5 +13524,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14505,5 +14485,98 @@
 msgstr "Barvy"
 
-#: ../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 "Kreslit šipky ve směru jízdy"
+
+#. 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 "Pouze na prvním úseku cesty."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Vykreslit segmenty s pořadovými čísly"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Vykreslit ohraničující box stažených dat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Vykreslovat virtuální uzly v modu výběru"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Vyhlazené mapy (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS body"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Zobrazovat směr u segmentů cesty."
+
+#. 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 ""
+
+#. 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 "Zobrazovat pořadí u všech segmentů v cestách."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Zobrazovat hranice dat stažených ze serveru."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
+
+#. 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 "Zobrazovat neaktivní vrstvy dat jinou barvou."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM data"
+
+#: ../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 "Použít globální nastavení."
+
+#: ../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
@@ -14514,10 +14587,10 @@
 msgstr "Všechny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Místní soubory"
 
-#: ../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
@@ -14526,31 +14599,36 @@
 msgstr "Žádný"
 
-#: ../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 "Vynutit kreslení spojnic mezi GPS body."
 
-#: ../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 "Kreslit větší GPS body"
 
-#: ../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 ""
 
-#: ../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 "Rychlost (červená = pomalá, zelená = rychlá)"
 
-#: ../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 ""
 
-#: ../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 ""
 "Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -14558,5 +14636,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"
@@ -14580,5 +14658,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
@@ -14621,5 +14699,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
@@ -14633,61 +14711,22 @@
 msgstr "Pěší"
 
-#: ../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 "Kreslit šipky ve směru jízdy"
-
-#: ../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 "Vytvořit značky při čtení GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
-#. 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 "Pouze na prvním úseku cesty."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Vykreslit segmenty s pořadovými čísly"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Vykreslit ohraničující box stažených dat"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Vykreslovat virtuální uzly v modu výběru"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Vyhlazené mapy (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Vytvořit značky při čtení GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14695,14 +14734,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 "Desc(ription) (popis)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Obojí"
 
-#: ../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 "
@@ -14710,9 +14750,11 @@
 msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
 
-#: ../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 "Kreslit čáru mezi body GPS."
 
-#: ../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 "
@@ -14720,9 +14762,10 @@
 msgstr ""
 
-#: ../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 "Maximální délka lokálních souborů (v metrech)"
 
-#: ../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."
@@ -14731,10 +14774,10 @@
 "kreslení všech linií."
 
-#: ../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 "Maximální délka (metrů)"
 
 #. 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."
@@ -14742,16 +14785,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../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 "Zobrazovat šipky pro čary spojující GPS body."
 
 #. 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 "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. 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 "
@@ -14759,13 +14801,14 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../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 "Minimální vzdálenost (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 "Zobrazovat větší tečky pro GPS body."
 
-#: ../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 "
@@ -14775,13 +14818,13 @@
 "v kartě vrstev."
 
-#: ../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 "Obarvovat body a části trasy podle rychlosti."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14789,63 +14832,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../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 "Barvy tras a bodů"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Značení bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS body"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Zobrazovat směr u segmentů cesty."
-
-#. 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 ""
-
-#. 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 "Zobrazovat pořadí u všech segmentů v cestách."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Zobrazovat hranice dat stažených ze serveru."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
-
-#. 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 "Zobrazovat neaktivní vrstvy dat jinou barvou."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16667,25 +16675,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Stahuji {0} objekt z ''{1}''"
+msgstr ""
 
 #: ../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 "Upozornění: nepovedlo se načíst MOTD z ''{0}''. Vyjímka byla: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18381,5 +18389,6 @@
 msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
 
-#: ../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 ""
@@ -18388,11 +18397,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -36285,9 +36294,9 @@
 msgstr "Zobrazit nekompletní adresy"
 
-#: ../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 "položky"
 
-#: ../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 "žádné položky"
@@ -36388,5 +36397,5 @@
 msgstr "Vyberat všechny adresy s neúplnými údaji."
 
-#: ../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 "Vlastnosti vrstvy"
@@ -37315,7 +37324,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Zapnout automatické cachování."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37412,7 +37420,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klikněte pro zrušení aktuální operace"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38091,4 +38098,20 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Přizpůsobit kreslení linií"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Kreslit spojnice mezi body v této vrstvě"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Nereslit spojnice mezi body v této vrstvě"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38703,12 +38726,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Skrýt toto tlačítko"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Skrýt toto tlačítko"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38717,14 +38738,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Lesní/polní cesta kvalita 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40326,5 +40343,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}"
@@ -40332,5 +40349,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 ""
@@ -42744,11 +42761,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Aby bylo možné body spojit, vyberte prosím alespoň dva body, nebo jeden bod "
-"v blízkosti jiného."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -46912,4 +46926,7 @@
 #~ "'?'."
 
+#~ msgid "Track Grade 3"
+#~ msgstr "Lesní/polní cesta kvalita 3"
+
 #~ msgid "Track Grade 2"
 #~ msgstr "Lesní/polní cesta kvalita 2"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 26406)
+++ applications/editors/josm/i18n/po/da.po	(revision 26428)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:29+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -18,6 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:35+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:44+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -78,5 +78,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
@@ -165,5 +165,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
@@ -404,5 +404,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
@@ -1219,5 +1219,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
@@ -1458,5 +1458,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"
@@ -2443,5 +2443,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
@@ -8037,5 +8037,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 ""
@@ -9521,5 +9521,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
@@ -12432,16 +12432,16 @@
 msgstr "Tilpas farve"
 
-#: ../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 "Standard"
 
-#: ../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 "Vælg en farve"
 
-#: ../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
@@ -12451,6 +12451,6 @@
 msgstr "Navn: {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
@@ -12460,5 +12460,5 @@
 msgstr "Beskrivelse: {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
@@ -12470,5 +12470,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
@@ -12480,16 +12480,16 @@
 msgstr "Beskrivelse"
 
-#: ../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 "Tidsrum"
 
-#: ../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ængde"
 
-#: ../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
@@ -12498,6 +12498,6 @@
 msgstr "Længde: {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
@@ -12508,6 +12508,6 @@
 msgstr[1] "{0} ruter, "
 
-#: ../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
@@ -12518,11 +12518,11 @@
 msgstr[1] "{0} punkter"
 
-#: ../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
@@ -12532,10 +12532,10 @@
 msgstr[1] "{0} spor, "
 
-#: ../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 "Konvertér til datalag"
 
-#: ../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."
@@ -12545,10 +12545,10 @@
 "<br>Hvis du vil uploade traces, så kig her:</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
@@ -12559,7 +12559,7 @@
 msgstr "Konverteret fra: {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
@@ -12570,5 +12570,5 @@
 msgstr "Download fra OSM langs dette spor"
 
-#: ../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
@@ -12576,5 +12576,5 @@
 msgstr "Download alt indenfor:"
 
-#: ../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
@@ -12583,5 +12583,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
@@ -12589,5 +12589,5 @@
 msgstr "Maksimum område per anmodning:"
 
-#: ../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
@@ -12596,25 +12596,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 "Hent nær:"
 
-#: ../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 "kun spor"
 
-#: ../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 "kun punkter"
 
-#: ../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 "spor og punkter"
 
-#: ../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
@@ -12627,5 +12627,5 @@
 "du<br>at fortsætte?</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."
@@ -12633,5 +12633,5 @@
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../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 ""
@@ -12642,5 +12642,5 @@
 "blev udeladt eller flyttet til starten."
 
-#: ../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 ""
@@ -12651,35 +12651,15 @@
 "estimere deres tid blev udeladt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Tilpas linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Brug globale indstillinger."
-
-#: ../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 "Tegn linjer mellem punkter for dette lag."
-
 #: ../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 "Tegn ikke linjer mellem punkter for dette lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../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
@@ -12687,10 +12667,10 @@
 msgstr "Navngivne punkter fra {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 "Importér lyd"
 
-#: ../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
@@ -12704,6 +12684,6 @@
 "af hvordan de hænger sammen med lyddata.</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
@@ -12711,10 +12691,10 @@
 msgstr "Import er ikke mulig"
 
-#: ../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 "Wave-lydfiler (*.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
@@ -12722,10 +12702,10 @@
 msgstr "Lyd-markører fra {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 "Importér billeder"
 
-#: ../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
@@ -13530,5 +13510,5 @@
 msgstr "Fejl ved visning af 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
@@ -13538,5 +13518,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14517,5 +14497,99 @@
 msgstr "Farver"
 
-#: ../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 "Tegn retningspile."
+
+#. 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 "Kun ved enden af vejen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Tegn ensrettet pile."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Tegn numre for segment-rækkefølgen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Tegn grænserne for downloadet data"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Tegn virtuelle punkter i valg-tilstand"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Tegn inaktive lag i anden farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Udglattet kortgrafik (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Tegn retningsvisere på vejstykker"
+
+#. 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 ""
+
+#. 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 "Tegn ordensnumrene på alle segmenter i deres vej."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Tegn omridset af data hentet fra serveren."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Tegn virtuelle punkter i valg-tilstand for lette tilpasninger af veje.."
+
+#. 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 "Tegn inaktive datalag i en anden farve."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-data"
+
+#: ../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 "Brug globale indstillinger."
+
+#: ../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
@@ -14526,10 +14600,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 filer"
 
-#: ../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
@@ -14538,30 +14612,35 @@
 msgstr "Ingen"
 
-#: ../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 "Fremtving linjer, hvis ingen segmenter blev importeret."
 
-#: ../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 "Tegn store GPS-punkter."
 
-#: ../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 "Tegn en cirkel udfra HDOP-værdi."
 
-#: ../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 "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../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 ""
 
-#: ../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 "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -14569,5 +14648,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"
@@ -14591,5 +14670,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
@@ -14632,5 +14711,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
@@ -14644,61 +14723,22 @@
 msgstr "Gående"
 
-#: ../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 "Tegn retningspile."
-
-#: ../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 "Opret markører ved læsning af GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
-#. 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 "Kun ved enden af vejen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Tegn ensrettet pile."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Tegn numre for segment-rækkefølgen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Tegn grænserne for downloadet data"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Tegn virtuelle punkter i valg-tilstand"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Tegn inaktive lag i anden farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Udglattet kortgrafik (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Opret markører ved læsning af GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14706,14 +14746,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 "Beskrivelse(Desc)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Begge"
 
-#: ../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 "
@@ -14722,9 +14763,11 @@
 "Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
 
-#: ../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 "Tegn linjer mellem rå GPS-punkter"
 
-#: ../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 "
@@ -14734,9 +14777,10 @@
 "for at tegne alle linjer."
 
-#: ../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 "Maksimal længde for lokale filer (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."
@@ -14745,10 +14789,10 @@
 "linjer."
 
-#: ../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 "Maksimal længde (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."
@@ -14757,11 +14801,10 @@
 "information."
 
-#: ../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 "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. 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 ""
@@ -14769,5 +14812,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 "
@@ -14775,13 +14818,14 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../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 "Mindste afstand (pixels)"
 
-#: ../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 "Tegn større prikker for GPS-punkter."
 
-#: ../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 "
@@ -14790,13 +14834,13 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i laghåndtering."
 
-#: ../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 "Farvelægger punkter og spor efter hastighed."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14806,64 +14850,28 @@
 "optage-enhed skal logge denne information."
 
-#: ../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 ""
+
+#. 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 "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
 
-#: ../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 "Farvelægning af spor og punkter"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Tegn retningsvisere på vejstykker"
-
-#. 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 ""
-
-#. 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 "Tegn ordensnumrene på alle segmenter i deres vej."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Tegn omridset af data hentet fra serveren."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Tegn virtuelle punkter i valg-tilstand for lette tilpasninger af veje.."
-
-#. 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 "Tegn inaktive datalag i en anden farve."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16700,24 +16708,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Downloader {0} objekt fra ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18403,5 +18411,6 @@
 "Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}."
 
-#: ../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 ""
@@ -18412,11 +18421,11 @@
 "konfigurationsproblem. JOSM vil holde op med at virke."
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -36307,9 +36316,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36408,5 +36417,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37329,7 +37338,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Slå automatisk caching til."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37424,7 +37432,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klik for at afbryde den aktuelle operation"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38096,4 +38103,20 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Tilpas linjetegning"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter for dette lag."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkter for dette lag."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Vælg linjetegnings-indstillinger"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38708,12 +38731,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Skjul denne knap"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Skjul denne knap"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38722,14 +38743,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/t"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Spor-niveau 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40319,5 +40336,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}"
@@ -40325,5 +40342,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 ""
@@ -42723,11 +42740,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Angiv venligst mindst to punkter der skal sammenføjes, eller et punkt er tæt "
-"på et andet punkt."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44148,4 +44162,7 @@
 #~ msgid "Footway"
 #~ msgstr "Gangsti"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Spor-niveau 3"
 
 #~ msgid "Track Grade 2"
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}."
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 26406)
+++ applications/editors/josm/i18n/po/el.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 15:55+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:22+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:33+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
@@ -161,5 +161,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
@@ -393,5 +393,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
@@ -1201,5 +1201,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
@@ -1432,5 +1432,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"
@@ -2387,5 +2387,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
@@ -7794,5 +7794,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 ""
@@ -9269,5 +9269,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
@@ -12048,16 +12048,16 @@
 msgstr "Προσαρμογή Χρώματος"
 
-#: ../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 "Προκαθορισμένο"
 
-#: ../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 "Επιλέξτε ένα χρώμα"
 
-#: ../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
@@ -12067,6 +12067,6 @@
 msgstr "Όνομα: {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
@@ -12076,5 +12076,5 @@
 msgstr "Περιγραφή: {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
@@ -12086,5 +12086,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
@@ -12096,16 +12096,16 @@
 msgstr "Περιγραφή"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12114,6 +12114,6 @@
 msgstr ""
 
-#: ../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
@@ -12124,6 +12124,6 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../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
@@ -12134,11 +12134,11 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../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"
 
-#: ../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
@@ -12148,10 +12148,10 @@
 msgstr[1] "{0} τροχιές, "
 
-#: ../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 "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../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."
@@ -12159,10 +12159,10 @@
 msgstr ""
 
-#: ../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
@@ -12173,7 +12173,7 @@
 msgstr "Μετατράπηκε από: {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
@@ -12184,5 +12184,5 @@
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../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
@@ -12190,5 +12190,5 @@
 msgstr "Λήψη όλων εντός:"
 
-#: ../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
@@ -12197,5 +12197,5 @@
 msgstr "{0} μέτρα"
 
-#: ../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
@@ -12203,5 +12203,5 @@
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../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
@@ -12210,25 +12210,25 @@
 msgstr "{0} τετρ. χλμ"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12241,5 +12241,5 @@
 "συνεχίσετε;</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."
@@ -12247,5 +12247,5 @@
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../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 ""
@@ -12254,5 +12254,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12261,35 +12261,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Προσαρμογή του σχεδιασμού γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Χρηση καθολικών ρυθμίσεων."
-
-#: ../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 "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
 #: ../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 "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../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
@@ -12297,10 +12277,10 @@
 msgstr ""
 
-#: ../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 "Εισαγωγή Ήχου"
 
-#: ../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
@@ -12311,6 +12291,6 @@
 msgstr ""
 
-#: ../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
@@ -12318,10 +12298,10 @@
 msgstr ""
 
-#: ../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 "Αρχεία Κυματομορφής (*.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
@@ -12329,10 +12309,10 @@
 msgstr "Σημάδια ήχου από {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 "Εισαγωγή εικόνων"
 
-#: ../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
@@ -13115,5 +13095,5 @@
 msgstr "Σφάλμα στην εμφάνιση του 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
@@ -13123,5 +13103,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14048,5 +14028,99 @@
 msgstr "Χρώματα"
 
-#: ../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 "Σχεδιασμός Βελών Κατεύθυνσης"
+
+#. 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Σημεία GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Δεδομένα OSM"
+
+#: ../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 "Χρηση καθολικών ρυθμίσεων."
+
+#: ../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
@@ -14057,10 +14131,10 @@
 msgstr "Όλα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
-#: ../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
@@ -14069,30 +14143,35 @@
 msgstr "Κανένα"
 
-#: ../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 ""
 
-#: ../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 "Σχεδιασμός μεγάλων σημείων GPS."
 
-#: ../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 ""
 
-#: ../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 "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14100,5 +14179,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"
@@ -14122,5 +14201,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
@@ -14163,5 +14242,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
@@ -14175,61 +14254,22 @@
 msgstr "Πεζοί"
 
-#: ../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 "Σχεδιασμός Βελών Κατεύθυνσης"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
-#. 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14237,14 +14277,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14252,9 +14293,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14262,9 +14305,10 @@
 msgstr ""
 
-#: ../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 "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
-#: ../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."
@@ -14273,26 +14317,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../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 "Μέγιστο μήκος (μέτρα)"
 
 #. 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."
 msgstr ""
 
-#: ../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 "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. 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 ""
 
 #. 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 "
@@ -14300,13 +14343,14 @@
 msgstr ""
 
-#: ../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 "Ελάχιστη απόσταση (pixels)"
 
-#: ../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 "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../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 "
@@ -14314,13 +14358,13 @@
 msgstr ""
 
-#: ../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 "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14328,64 +14372,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Σημεία GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Εφαρμογή antialiasing σετην προβολή χάρτη με αποτέλεσμα ομαλότερη απεικόνηση."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Δεδομένα OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16169,24 +16177,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Λήψη πλακιδίου WMS από {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17810,5 +17818,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17817,11 +17826,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35678,9 +35687,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35779,5 +35788,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37457,4 +37466,20 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Προσαρμογή του σχεδιασμού γραμμών"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38069,7 +38094,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Κρυψώνα"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38082,14 +38106,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} χμ/ω"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Όνομα οδού: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39685,5 +39705,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}"
@@ -39691,5 +39711,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 ""
@@ -42085,9 +42105,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42983,4 +43002,7 @@
 #~ msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο."
 
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
+
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -43218,4 +43240,7 @@
 #~ msgid "Exception occurred"
 #~ msgstr "Δημιοθργήθηκε εξαίρεση"
+
+#~ msgid "Download WMS tile from {0}"
+#~ msgstr "Λήψη πλακιδίου WMS από {0}"
 
 #~ msgid "WMS Plugin Help"
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 26406)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:31+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:24+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:35+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
@@ -161,5 +161,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
@@ -397,5 +397,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
@@ -1206,5 +1206,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
@@ -1434,5 +1434,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"
@@ -2406,5 +2406,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
@@ -7942,5 +7942,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 ""
@@ -9425,5 +9425,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
@@ -12352,16 +12352,16 @@
 msgstr "Customise Colour"
 
-#: ../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 "Default"
 
-#: ../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 "Choose a colour"
 
-#: ../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
@@ -12371,6 +12371,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
@@ -12380,5 +12380,5 @@
 msgstr "Description: {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
@@ -12390,5 +12390,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
@@ -12400,16 +12400,16 @@
 msgstr "Description"
 
-#: ../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 "Timespan"
 
-#: ../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 "Length"
 
-#: ../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
@@ -12418,6 +12418,6 @@
 msgstr ""
 
-#: ../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
@@ -12428,6 +12428,6 @@
 msgstr[1] "{0} routes, "
 
-#: ../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
@@ -12438,11 +12438,11 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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 point"
 
-#: ../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
@@ -12452,10 +12452,10 @@
 msgstr[1] ""
 
-#: ../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 "Convert to data layer"
 
-#: ../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."
@@ -12465,10 +12465,10 @@
 "<br>If you want to upload traces, look here:</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
@@ -12479,7 +12479,7 @@
 msgstr "Converted from: {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
@@ -12490,5 +12490,5 @@
 msgstr "Download from OSM along this track"
 
-#: ../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
@@ -12496,5 +12496,5 @@
 msgstr "Download everything within:"
 
-#: ../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
@@ -12503,5 +12503,5 @@
 msgstr "{0} metres"
 
-#: ../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
@@ -12509,5 +12509,5 @@
 msgstr "Maximum area per request:"
 
-#: ../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
@@ -12516,25 +12516,25 @@
 msgstr "{0} sq 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12547,10 +12547,10 @@
 "wish<br>to continue?</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."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../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 ""
@@ -12561,5 +12561,5 @@
 "the end were omitted or moved to the start."
 
-#: ../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 ""
@@ -12570,35 +12570,15 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../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 "Draw lines between points for this layer."
-
 #: ../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 "Do not draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../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
@@ -12606,10 +12586,10 @@
 msgstr "Named Trackpoints from {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 "Import Audio"
 
-#: ../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
@@ -12623,6 +12603,6 @@
 "them with audio data.</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
@@ -12630,10 +12610,10 @@
 msgstr "Import not possible"
 
-#: ../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 "Wave Audio files (*.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
@@ -12641,10 +12621,10 @@
 msgstr "Audio markers from {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 "Import images"
 
-#: ../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
@@ -13449,5 +13429,5 @@
 msgstr "Error displaying 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
@@ -13458,5 +13438,5 @@
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {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}''..."
@@ -14461,5 +14441,98 @@
 msgstr "Colours"
 
-#: ../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 "Draw Direction Arrows"
+
+#. 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 "Only on the head of a way."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Draw segment order numbers"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Draw boundaries of downloaded data"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Draw virtual nodes in select mode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Draw inactive layers in other colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Smooth map graphics (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Draw direction hints for way segments."
+
+#. 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 ""
+
+#. 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 "Draw the order numbers of all segments within their way."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Draw the boundaries of data loaded from the server."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Draw virtual nodes in select mode for easy way modification."
+
+#. 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 "Draw the inactive data layers in a different colour."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM Data"
+
+#: ../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 "Use global settings."
+
+#: ../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
@@ -14470,10 +14543,10 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Local files"
 
-#: ../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
@@ -14482,30 +14555,35 @@
 msgstr "None"
 
-#: ../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 "Force lines if no segments imported."
 
-#: ../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 "Draw large GPS points."
 
-#: ../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 "Draw a circle form HDOP value."
 
-#: ../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 "Velocity (red = slow, green = fast)"
 
-#: ../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 ""
 
-#: ../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 "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -14513,5 +14591,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"
@@ -14535,5 +14613,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
@@ -14576,5 +14654,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
@@ -14588,61 +14666,22 @@
 msgstr "Foot"
 
-#: ../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 "Draw Direction Arrows"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
-#. 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 "Only on the head of a way."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Draw segment order numbers"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Draw boundaries of downloaded data"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Draw virtual nodes in select mode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Draw inactive layers in other colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Smooth map graphics (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14650,14 +14689,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14667,9 +14707,11 @@
 "layer."
 
-#: ../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 "Draw lines between raw GPS points"
 
-#: ../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 "
@@ -14679,9 +14721,10 @@
 "draw all lines."
 
-#: ../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 "Maximum length for local files (metres)"
 
-#: ../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."
@@ -14689,10 +14732,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../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 "Maximum length (metres)"
 
 #. 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."
@@ -14700,11 +14743,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../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 "Draw direction arrows for lines, connecting GPS points."
 
 #. 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 ""
@@ -14712,5 +14754,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 "
@@ -14720,13 +14762,14 @@
 "one."
 
-#: ../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 "Minimum distance (pixels)"
 
-#: ../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 "Draw larger dots for the GPS points."
 
-#: ../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 "
@@ -14736,13 +14779,13 @@
 "in Layer Manager."
 
-#: ../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 "Colours points and track segments by velocity."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14752,63 +14795,28 @@
 "capture device needs to log that information."
 
-#: ../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 ""
+
+#. 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 "Allows to tune the track colouring for different average speeds."
 
-#: ../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 "Track and Point Colouring"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Draw direction hints for way segments."
-
-#. 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 ""
-
-#. 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 "Draw the order numbers of all segments within their way."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Draw the boundaries of data loaded from the server."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Draw virtual nodes in select mode for easy way modification."
-
-#. 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 "Draw the inactive data layers in a different colour."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16681,25 +16689,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Downloading {0} object from ''{1}''"
+msgstr ""
 
 #: ../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 "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18463,5 +18471,6 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../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 ""
@@ -18472,11 +18481,11 @@
 "problem. JOSM will stop working."
 
-#: ../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}"
 msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {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 ""
@@ -36391,9 +36400,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36492,5 +36501,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37429,7 +37438,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Enable automatic caching."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37529,7 +37537,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Click to cancel the current operation"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38219,4 +38226,20 @@
 "<br>If you want to upload traces, look here:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38831,7 +38854,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Hide elements"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38844,14 +38866,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Street name: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40449,5 +40467,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}"
@@ -40455,5 +40473,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 ""
@@ -42850,9 +42868,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Please select at least two nodes to merge."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43506,4 +43523,7 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "JOSM Online Help"
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Please select at least two nodes to merge."
 
 #~ msgid "Merge Anyway"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 26406)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 26428)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -20,6 +20,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:30+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:41+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -80,5 +80,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
@@ -400,5 +400,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
@@ -1209,5 +1209,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
@@ -1437,5 +1437,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"
@@ -2409,5 +2409,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
@@ -7945,5 +7945,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 ""
@@ -9428,5 +9428,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
@@ -12365,16 +12365,16 @@
 msgstr "Customise Colour"
 
-#: ../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 "Default"
 
-#: ../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 "Choose a colour"
 
-#: ../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
@@ -12384,6 +12384,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
@@ -12393,5 +12393,5 @@
 msgstr "Description: {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
@@ -12403,5 +12403,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
@@ -12413,16 +12413,16 @@
 msgstr "Description"
 
-#: ../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 "Timespan"
 
-#: ../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 "Length"
 
-#: ../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
@@ -12431,6 +12431,6 @@
 msgstr ""
 
-#: ../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
@@ -12441,6 +12441,6 @@
 msgstr[1] "{0} routes, "
 
-#: ../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
@@ -12451,11 +12451,11 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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 point"
 
-#: ../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
@@ -12465,10 +12465,10 @@
 msgstr[1] "{0} tracks, "
 
-#: ../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 "Convert to data layer"
 
-#: ../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."
@@ -12478,10 +12478,10 @@
 "<br>If you want to upload traces, look here:</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
@@ -12492,7 +12492,7 @@
 msgstr "Converted from: {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
@@ -12503,5 +12503,5 @@
 msgstr "Download from OSM along this track"
 
-#: ../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
@@ -12509,5 +12509,5 @@
 msgstr "Download everything within:"
 
-#: ../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
@@ -12516,5 +12516,5 @@
 msgstr "{0} metres"
 
-#: ../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
@@ -12522,5 +12522,5 @@
 msgstr "Maximum area per request:"
 
-#: ../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
@@ -12529,25 +12529,25 @@
 msgstr "{0} sq 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12560,10 +12560,10 @@
 "wish<br>to continue?</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."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../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 ""
@@ -12574,5 +12574,5 @@
 "the end were omitted or moved to the start."
 
-#: ../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 ""
@@ -12583,35 +12583,15 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../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 "Draw lines between points for this layer."
-
 #: ../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 "Do not draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../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
@@ -12619,10 +12599,10 @@
 msgstr "Named Trackpoints from {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 "Import Audio"
 
-#: ../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
@@ -12636,6 +12616,6 @@
 "them with audio data.</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
@@ -12643,10 +12623,10 @@
 msgstr "Import not possible"
 
-#: ../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 "Wave Audio files (*.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
@@ -12654,10 +12634,10 @@
 msgstr "Audio markers from {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 "Import images"
 
-#: ../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
@@ -13462,5 +13442,5 @@
 msgstr "Error displaying 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
@@ -13471,5 +13451,5 @@
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {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}''..."
@@ -14476,5 +14456,98 @@
 msgstr "Colours"
 
-#: ../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 "Draw Direction Arrows"
+
+#. 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 "Only on the head of a way."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Draw segment order numbers"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Draw boundaries of downloaded data"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Draw virtual nodes in select mode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Draw inactive layers in other colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Smooth map graphics (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Draw direction hints for way segments."
+
+#. 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 ""
+
+#. 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 "Draw the order numbers of all segments within their way."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Draw the boundaries of data loaded from the server."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Draw virtual nodes in select mode for easy way modification."
+
+#. 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 "Draw the inactive data layers in a different colour."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM Data"
+
+#: ../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 "Use global settings."
+
+#: ../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
@@ -14485,10 +14558,10 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Local files"
 
-#: ../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
@@ -14497,30 +14570,35 @@
 msgstr "None"
 
-#: ../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 "Force lines if no segments imported."
 
-#: ../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 "Draw large GPS points."
 
-#: ../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 "Draw a circle form HDOP value."
 
-#: ../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 "Velocity (red = slow, green = fast)"
 
-#: ../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 ""
 
-#: ../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 "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -14528,5 +14606,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"
@@ -14550,5 +14628,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
@@ -14591,5 +14669,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
@@ -14603,61 +14681,22 @@
 msgstr "Foot"
 
-#: ../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 "Draw Direction Arrows"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
-#. 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 "Only on the head of a way."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Draw segment order numbers"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Draw boundaries of downloaded data"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Draw virtual nodes in select mode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Draw inactive layers in other colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Smooth map graphics (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14665,14 +14704,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14682,9 +14722,11 @@
 "layer."
 
-#: ../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 "Draw lines between raw GPS points"
 
-#: ../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 "
@@ -14694,9 +14736,10 @@
 "draw all lines."
 
-#: ../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 "Maximum length for local files (metres)"
 
-#: ../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."
@@ -14704,10 +14747,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../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 "Maximum length (metres)"
 
 #. 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."
@@ -14715,11 +14758,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../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 "Draw direction arrows for lines, connecting GPS points."
 
 #. 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 ""
@@ -14727,5 +14769,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 "
@@ -14735,13 +14777,14 @@
 "one."
 
-#: ../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 "Minimum distance (pixels)"
 
-#: ../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 "Draw larger dots for the GPS points."
 
-#: ../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 "
@@ -14751,13 +14794,13 @@
 "in Layer Manager."
 
-#: ../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 "Colours points and track segments by velocity."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14767,63 +14810,28 @@
 "capture device needs to log that information."
 
-#: ../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 ""
+
+#. 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 "Allows to tune the track colouring for different average speeds."
 
-#: ../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 "Track and Point Colouring"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Draw direction hints for way segments."
-
-#. 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 ""
-
-#. 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 "Draw the order numbers of all segments within their way."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Draw the boundaries of data loaded from the server."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Draw virtual nodes in select mode for easy way modification."
-
-#. 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 "Draw the inactive data layers in a different colour."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16696,25 +16704,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Downloading {0} object from ''{1}''"
+msgstr ""
 
 #: ../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 "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18486,5 +18494,6 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../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 ""
@@ -18495,11 +18504,11 @@
 "problem. JOSM will stop working."
 
-#: ../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}"
 msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {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 ""
@@ -36414,9 +36423,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36515,5 +36524,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37452,7 +37461,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Enable automatic caching."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37552,7 +37560,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Click to cancel the current operation"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38242,4 +38249,20 @@
 "<br>If you want to upload traces, look here:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38854,7 +38877,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Hide elements"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38867,14 +38889,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Track Grade 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40472,5 +40490,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}"
@@ -40478,5 +40496,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 ""
@@ -42889,9 +42907,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Please select at least two nodes to merge."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44274,4 +44291,7 @@
 #~ msgstr "Select, move and rotate objects"
 
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Please select at least two nodes to merge."
+
 #~ msgid ""
 #~ "The selected nodes have differing relation memberships.  Do you still "
@@ -44574,4 +44594,7 @@
 #~ msgid "Footway"
 #~ msgstr "Footway"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
 
 #~ msgid "Track Grade 2"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 26406)
+++ applications/editors/josm/i18n/po/es.po	(revision 26428)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
-"PO-Revision-Date: 2011-07-22 09:07+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"PO-Revision-Date: 2011-07-28 11:33+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\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:31+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
@@ -165,5 +165,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
@@ -405,5 +405,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
@@ -1473,5 +1473,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"
@@ -1538,4 +1538,6 @@
 "again."
 msgstr ""
+"El enlace o la id introducidos no corresponden con el servicio seleccionado. "
+"Inténtelo de nuevo."
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
@@ -2470,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
@@ -2981,4 +2983,7 @@
 "node."
 msgstr ""
+"Arrastre un segmento de vía para crear un rectángulo. CTRL-Arrastre para "
+"move un segmento a lo largo de su normal, ALT-Arrastre para crear un nuevo "
+"rectángulo, haga doble click para añadir un nuevo nodo."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:352
@@ -3001,4 +3006,7 @@
 "a parallel copy (Alt toggles tag preservation)"
 msgstr ""
+"Elija vías como en el modo Selección. Arrastre las vías seleccionadas o una "
+"vía única para crear una copia paralela (Alt activa o desactiva la "
+"conservación de etiquetas)"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:189
@@ -4501,5 +4509,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:154
 msgid "Activating the standard map renderer instead."
-msgstr ""
+msgstr "Activando en su lugar el renderizador estándar de mapas."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:147
@@ -4523,5 +4531,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:166
 msgid "Renders the map as simple wire frame."
-msgstr ""
+msgstr "Renderiza el mapa como un armazón de alambre sencillo."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:170
@@ -4906,5 +4914,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
 msgid "Duplicated relations."
-msgstr ""
+msgstr "Relaciones duplicadas."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:139
@@ -7837,5 +7845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:153
 msgid " not in data set"
-msgstr ""
+msgstr " no está en el data set"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:112
@@ -7843,5 +7851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
 msgid " incomplete\n"
-msgstr ""
+msgstr " incompleto\n"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:117
@@ -7864,5 +7872,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:143
 msgid "  nodes:\n"
-msgstr ""
+msgstr "  nodos:\n"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:151
@@ -7924,5 +7932,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:211
 msgid "  tags:\n"
-msgstr ""
+msgstr "  etiquetas:\n"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223
@@ -7937,10 +7945,10 @@
 #, java-format
 msgid "id: {0}"
-msgstr ""
+msgstr "id: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:262
 #, java-format
 msgid " name: {0}"
-msgstr ""
+msgstr " nombre: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:265
@@ -8001,5 +8009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:328
 msgid "xml"
-msgstr ""
+msgstr "xml"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:330
@@ -8009,5 +8017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
 msgid "unkown"
-msgstr ""
+msgstr "desconocido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8165,5 +8173,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 "Volviendo a cargar fuentes de estilos"
@@ -8260,5 +8268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Add the selected relations to the current selection"
-msgstr ""
+msgstr "Añade las relaciones seleccionadas a la selección actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
@@ -8279,4 +8287,6 @@
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
+"Añade los miembros de todas las relaciones seleccionadas a la selección "
+"actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:471
@@ -9658,5 +9668,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
@@ -10457,5 +10467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
 msgid "Select the members of selected relation"
-msgstr ""
+msgstr "Elige los miembros de la relación seleccionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175
@@ -12699,16 +12709,16 @@
 msgstr "Personalizar colores"
 
-#: ../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 "Predeterminado"
 
-#: ../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 "Seleccionar una color"
 
-#: ../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
@@ -12718,6 +12728,6 @@
 msgstr "Nombre: {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
@@ -12727,5 +12737,5 @@
 msgstr "Descripción: {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
@@ -12737,5 +12747,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
@@ -12747,16 +12757,16 @@
 msgstr "Descripción"
 
-#: ../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 "Intervalo de tiempo"
 
-#: ../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 "Longitud"
 
-#: ../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
@@ -12765,6 +12775,6 @@
 msgstr "Longitud: {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
@@ -12775,6 +12785,6 @@
 msgstr[1] "{0} rutas, "
 
-#: ../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
@@ -12785,11 +12795,11 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../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 "punto GPS"
 
-#: ../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
@@ -12799,10 +12809,10 @@
 msgstr[1] "{0} trazas, "
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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."
@@ -12812,10 +12822,10 @@
 "<br>Si desea subir trazas, ver:</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 (EN)"
 
-#: ../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
@@ -12826,7 +12836,7 @@
 msgstr "Convertido desde: {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
@@ -12837,5 +12847,5 @@
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../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
@@ -12843,5 +12853,5 @@
 msgstr "Descargar todo entre:"
 
-#: ../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
@@ -12850,5 +12860,5 @@
 msgstr "{0} metros"
 
-#: ../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
@@ -12856,5 +12866,5 @@
 msgstr "Área máxima por petición:"
 
-#: ../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
@@ -12863,25 +12873,25 @@
 msgstr "{0} km2"
 
-#: ../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 "Descargar cercanos:"
 
-#: ../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 "Solamente trazas"
 
-#: ../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 "Solamente puntos de vía"
 
-#: ../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 "trazas y puntos de vía"
 
-#: ../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
@@ -12894,10 +12904,10 @@
 "¿Desea continuar?</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."
 msgstr "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../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 ""
@@ -12909,5 +12919,5 @@
 "comienzo."
 
-#: ../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 ""
@@ -12918,35 +12928,15 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Personalice el dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Usar las preferencias globales"
-
-#: ../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 "Dibujar líneas entre puntos para esta capa"
-
 #: ../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 "No dibujar líneas entre puntos para esta capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Seleccione las opciones de dibujo de línea"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../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
@@ -12954,10 +12944,10 @@
 msgstr "Puntos de traza nombrados desde {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 "Importar audio"
 
-#: ../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
@@ -12971,6 +12961,6 @@
 "correlacionar con datos de audio.</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
@@ -12978,10 +12968,10 @@
 msgstr "No es posible importar"
 
-#: ../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 "archivos Wave Audio (*.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
@@ -12989,10 +12979,10 @@
 msgstr "Marcadores de audio desde {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 "Importar imágenes"
 
-#: ../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
@@ -13809,5 +13799,5 @@
 msgstr "Error mostrando la 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
@@ -13819,5 +13809,5 @@
 "{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}''..."
@@ -14873,5 +14863,106 @@
 msgstr "Colores"
 
-#: ../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 "Dibujar las flechas de dirección"
+
+#. 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 "Solo en la cabecera de la vía."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Dibuja flechas de sentido único."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Dibujar los números de orden de los segmentos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Dibujar los límites de los datos descargados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Dibujar nodos virtuales en el modo selección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Dibujar las capas inactivas en otro color"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Suavizar los gráficos del mapa (antialias)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Dibujar solo el contorno de las áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Puntos GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Dibujar pistas de dirección para los segmentos de vía"
+
+#. 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 ""
+"Dibuja flechas en la dirección de las vías de sentido único y en otros "
+"elementos con dirección."
+
+#. 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 "Dibujar los números de orden de todos los segmentos de una vía"
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Aplicar antialias a la vista del mapa da como resultado una apariencia más "
+"suave"
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Dibujar los límites de los datos descargados del servidor"
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Dibujar nodos virtuales en el modo selección para modificar las vias "
+"facilmente"
+
+#. 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 "Dibujar las capas inactivas en un color diferente"
+
+#: ../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 ""
+"Esta opción suprime el relleno de áreas, anulando cualquier cosa "
+"especificada en el estilo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Datos OSM"
+
+#: ../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 "Usar las preferencias globales"
+
+#: ../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
@@ -14882,10 +14973,10 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../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
@@ -14894,26 +14985,27 @@
 msgstr "Ninguno"
 
-#: ../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 "Forzar lineas si no hay segmentos importados"
 
-#: ../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 "Dibujar más grandes los puntos GPS"
 
-#: ../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 "Dibujar el valor HDOP de forma circular"
 
-#: ../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 "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../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 ""
 
-#: ../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 ""
@@ -14921,5 +15013,9 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -14927,5 +15023,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"
@@ -14949,5 +15045,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
@@ -14990,5 +15086,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
@@ -15002,61 +15098,22 @@
 msgstr "Pie"
 
-#: ../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 "Dibujar las flechas de dirección"
-
-#: ../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 "Crear marcadores al leer GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
-#. 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 "Solo en la cabecera de la vía."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Dibuja flechas de sentido único."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Dibujar los números de orden de los segmentos"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Dibujar los límites de los datos descargados"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Dibujar nodos virtuales en el modo selección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Dibujar las capas inactivas en otro color"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Suavizar los gráficos del mapa (antialias)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Crear marcadores al leer GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Dibujar solo el contorno de las áreas"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automático"
 
 #. 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"
@@ -15064,14 +15121,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 "Desc(ripción)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Ambos"
 
-#: ../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 "
@@ -15081,9 +15139,11 @@
 "capa gpx."
 
-#: ../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 "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../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 "
@@ -15093,9 +15153,10 @@
 "Valor ''-1'' para dibujar todas las líneas."
 
-#: ../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 "Longitud máxima de los archivos locales (en metros)"
 
-#: ../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."
@@ -15104,10 +15165,10 @@
 "dibujarlas todas."
 
-#: ../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 "Longitud máxima (en metros)"
 
 #. 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."
@@ -15116,11 +15177,10 @@
 "información de la línea."
 
-#: ../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 "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. 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 ""
@@ -15129,5 +15189,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 "
@@ -15136,13 +15196,14 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../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 "Distancia mínima en píxeles"
 
-#: ../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 "dibuje grandes los puntos gps"
 
-#: ../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 "
@@ -15152,13 +15213,13 @@
 "personalizado en el Gestor de Capas."
 
-#: ../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 "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../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 ""
 
-#: ../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 "
@@ -15168,5 +15229,10 @@
 "(HDOP). Su dispositivo de captura requiere dejar traza de esta información."
 
-#: ../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 ""
+
+#. 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 ""
@@ -15174,67 +15240,19 @@
 "medias."
 
-#: ../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 "Coloreado de traza y punto"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Etiquetado de punto de ruta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Puntos GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Dibujar pistas de dirección para los segmentos de vía"
-
-#. 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 ""
-"Dibuja flechas en la dirección de las vías de sentido único y en otros "
-"elementos con dirección."
-
-#. 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 "Dibujar los números de orden de todos los segmentos de una vía"
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Aplicar antialias a la vista del mapa da como resultado una apariencia más "
-"suave"
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Dibujar los límites de los datos descargados del servidor"
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Dibujar nodos virtuales en el modo selección para modificar las vias "
-"facilmente"
-
-#. 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 "Dibujar las capas inactivas en un color diferente"
-
-#: ../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 ""
-"Esta opción suprime el relleno de áreas, anulando cualquier cosa "
-"especificada en el estilo seleccionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Datos OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17168,25 +17186,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Descargando {0} objeto de \"{1}\""
+msgstr ""
 
 #: ../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 "Advertencia: fallo al leer MDD de \"{0}\". La excepción fue: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -19017,5 +19035,6 @@
 "No se puede encontrar la traducción para el idioma {0}. Revertiendo a {1}."
 
-#: ../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 ""
@@ -19026,5 +19045,5 @@
 "configuración. JOSM dejará de trabajar."
 
-#: ../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}"
@@ -19032,6 +19051,6 @@
 "Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {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 ""
@@ -37044,9 +37063,9 @@
 msgstr "Mostrar direcciones incompletas"
 
-#: ../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 "elementos"
 
-#: ../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 "no hay elementos"
@@ -37150,5 +37169,5 @@
 msgstr "Seleccionar todas las direcciones con datos incompletos"
 
-#: ../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 "Propiedades de la capa"
@@ -38176,7 +38195,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Activar caché automático"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38280,7 +38298,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Haga clic para cancelar la operación actual"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38976,4 +38993,20 @@
 "mapa se considera peligroso.<br>Si quiere subir sus trazas, consulte aquí:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Personalice el dibujo de línea"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Dibujar líneas entre puntos para esta capa"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "No dibujar líneas entre puntos para esta capa"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Seleccione las opciones de dibujo de línea"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39588,12 +39621,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Ocultar este botón"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Ocultar este botón"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -39602,14 +39633,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -41231,5 +41258,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}"
@@ -41237,5 +41264,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 ""
@@ -43751,11 +43778,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Por favor, seleccione al menos dos nodos para poder unirlos, o un nodo muy "
-"cercano a otro."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -45564,4 +45588,7 @@
 #~ msgid "Edit Alpine Hiking"
 #~ msgstr "Editar sendero alpino"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
 
 #~ msgid "Track Grade 2"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 26406)
+++ applications/editors/josm/i18n/po/et.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:22+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:49+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
@@ -163,5 +163,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
@@ -397,5 +397,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
@@ -1202,5 +1202,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
@@ -1430,5 +1430,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"
@@ -2389,5 +2389,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
@@ -7779,5 +7779,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 ""
@@ -9252,5 +9252,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
@@ -12028,16 +12028,16 @@
 msgstr "Kohanda värvi"
 
-#: ../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 "Vaikimisi"
 
-#: ../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 "Vali värv"
 
-#: ../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
@@ -12047,6 +12047,6 @@
 msgstr ""
 
-#: ../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
@@ -12056,5 +12056,5 @@
 msgstr ""
 
-#: ../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
@@ -12066,5 +12066,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
@@ -12076,16 +12076,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12094,6 +12094,6 @@
 msgstr ""
 
-#: ../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
@@ -12104,6 +12104,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -12114,11 +12114,11 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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
@@ -12128,10 +12128,10 @@
 msgstr[1] ""
 
-#: ../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 "Muuda andme kihiks"
 
-#: ../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."
@@ -12139,10 +12139,10 @@
 msgstr ""
 
-#: ../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
@@ -12153,7 +12153,7 @@
 msgstr "Muudetud sellest: {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
@@ -12164,5 +12164,5 @@
 msgstr ""
 
-#: ../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
@@ -12170,5 +12170,5 @@
 msgstr ""
 
-#: ../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
@@ -12177,5 +12177,5 @@
 msgstr ""
 
-#: ../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
@@ -12183,5 +12183,5 @@
 msgstr ""
 
-#: ../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
@@ -12190,25 +12190,25 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12219,10 +12219,10 @@
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
@@ -12231,5 +12231,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12238,35 +12238,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../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 ""
-
 #: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12274,10 +12254,10 @@
 msgstr ""
 
-#: ../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 "Heli import"
 
-#: ../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
@@ -12288,6 +12268,6 @@
 msgstr ""
 
-#: ../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
@@ -12295,10 +12275,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12306,10 +12286,10 @@
 msgstr ""
 
-#: ../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 "Piltide import"
 
-#: ../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
@@ -13085,5 +13065,5 @@
 msgstr "Viga URL kuvamisel"
 
-#: ../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
@@ -13093,5 +13073,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14013,5 +13993,98 @@
 msgstr "Värvid"
 
-#: ../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 "Joonista suuna nooled"
+
+#. 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Joonista mitteaktiivsed kihid teist värvi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
@@ -14022,10 +14095,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14034,30 +14107,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14065,5 +14143,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"
@@ -14087,5 +14165,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
@@ -14128,5 +14206,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
@@ -14140,61 +14218,22 @@
 msgstr ""
 
-#: ../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 "Joonista suuna nooled"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#. 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Joonista mitteaktiivsed kihid teist värvi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14202,14 +14241,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14217,9 +14257,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14227,35 +14269,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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 ""
 
 #. 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 "
@@ -14263,13 +14305,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14277,13 +14320,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14291,62 +14334,27 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
 msgstr ""
 
@@ -16135,24 +16143,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Relatsiooni {0} allalaadimine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17777,5 +17785,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17784,11 +17793,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35641,9 +35650,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35742,5 +35751,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37411,4 +37420,20 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38023,7 +38048,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Peida"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38040,7 +38064,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Järjehoidja nimi: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39620,5 +39643,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}"
@@ -39626,5 +39649,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 ""
@@ -42020,9 +42043,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Palun vali vähemalt kaks sõlme mida liita."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42933,4 +42955,7 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "JOSM võrguabi"
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Palun vali vähemalt kaks sõlme mida liita."
 
 #~ msgid "Display history information about OSM ways or nodes."
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 26406)
+++ applications/editors/josm/i18n/po/eu.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 17:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:37+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:47+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
@@ -163,5 +163,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
@@ -401,5 +401,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
@@ -1210,5 +1210,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
@@ -1442,5 +1442,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"
@@ -2439,5 +2439,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
@@ -8017,5 +8017,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 ""
@@ -9490,5 +9490,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
@@ -12262,16 +12262,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12281,6 +12281,6 @@
 msgstr ""
 
-#: ../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
@@ -12290,5 +12290,5 @@
 msgstr ""
 
-#: ../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
@@ -12300,5 +12300,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
@@ -12310,16 +12310,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12328,6 +12328,6 @@
 msgstr ""
 
-#: ../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
@@ -12338,6 +12338,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -12348,11 +12348,11 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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
@@ -12362,10 +12362,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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."
@@ -12373,10 +12373,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12387,7 +12387,7 @@
 msgstr ""
 
-#: ../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
@@ -12398,5 +12398,5 @@
 msgstr ""
 
-#: ../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
@@ -12404,5 +12404,5 @@
 msgstr ""
 
-#: ../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
@@ -12411,5 +12411,5 @@
 msgstr ""
 
-#: ../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
@@ -12417,5 +12417,5 @@
 msgstr ""
 
-#: ../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
@@ -12424,25 +12424,25 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12453,10 +12453,10 @@
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
@@ -12465,5 +12465,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12472,35 +12472,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../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 ""
-
 #: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12508,10 +12488,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12522,6 +12502,6 @@
 msgstr ""
 
-#: ../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
@@ -12529,10 +12509,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12540,10 +12520,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -13321,5 +13301,5 @@
 msgstr ""
 
-#: ../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
@@ -13329,5 +13309,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14249,5 +14229,98 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
@@ -14258,10 +14331,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14270,30 +14343,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14301,5 +14379,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"
@@ -14323,5 +14401,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
@@ -14364,5 +14442,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
@@ -14376,61 +14454,22 @@
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#. 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14438,14 +14477,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14453,9 +14493,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14463,35 +14505,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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 ""
 
 #. 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 "
@@ -14499,13 +14541,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14513,13 +14556,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14527,62 +14570,27 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
 msgstr ""
 
@@ -16362,24 +16370,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Aukeratutako erlazioak jaitsi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17998,5 +18006,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -18005,11 +18014,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35903,9 +35912,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36004,5 +36013,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37011,7 +37020,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klik egin ekintza hau ezeztatzeko"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37672,4 +37680,20 @@
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38284,12 +38308,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Ezkutatu botoi hau"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Ezkutatu botoi hau"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38302,7 +38324,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Erabiltzaile izena:"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39880,5 +39901,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}"
@@ -39886,5 +39907,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 ""
@@ -42280,9 +42301,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Aukeratu bateratzeko bi nodo gutxienez."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42850,4 +42870,7 @@
 #~ msgid "Merge Anyway"
 #~ msgstr "Bateratu edonola"
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Aukeratu bateratzeko bi nodo gutxienez."
 
 #~ msgid "Create a new map."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 26406)
+++ applications/editors/josm/i18n/po/fi.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:24+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:35+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
@@ -404,5 +404,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
@@ -1217,5 +1217,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
@@ -1454,5 +1454,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"
@@ -2446,5 +2446,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
@@ -8047,5 +8047,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 ""
@@ -9531,5 +9531,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
@@ -12371,16 +12371,16 @@
 msgstr "Muokkaa väriä"
 
-#: ../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 "Oletusarvo"
 
-#: ../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 "Valitse väri"
 
-#: ../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
@@ -12390,6 +12390,6 @@
 msgstr "Nimi: {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
@@ -12399,5 +12399,5 @@
 msgstr "Kuvaus: {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
@@ -12409,5 +12409,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
@@ -12419,16 +12419,16 @@
 msgstr "Kuvaus"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12437,6 +12437,6 @@
 msgstr ""
 
-#: ../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
@@ -12447,6 +12447,6 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../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
@@ -12457,11 +12457,11 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../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-piste"
 
-#: ../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
@@ -12471,10 +12471,10 @@
 msgstr[1] "{0} jälkeä, "
 
-#: ../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 "Muuta datatasoksi"
 
-#: ../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."
@@ -12484,10 +12484,10 @@
 "<br>If you want to upload traces, look here:</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
@@ -12498,7 +12498,7 @@
 msgstr "Muutettu jäljestä {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
@@ -12509,5 +12509,5 @@
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../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
@@ -12515,5 +12515,5 @@
 msgstr "Lataa kaikki  alueella:"
 
-#: ../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
@@ -12522,5 +12522,5 @@
 msgstr "{0} metriä"
 
-#: ../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
@@ -12528,5 +12528,5 @@
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../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
@@ -12535,25 +12535,25 @@
 msgstr "{0} neliökilometriä"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12564,10 +12564,10 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</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."
 msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../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 ""
@@ -12576,5 +12576,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12583,35 +12583,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Muokkaa viivanpiirtotyyliä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Käytä globaaleja asetuksia."
-
-#: ../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 "Piirrä viivat pisteiden välillä tällä tasolla."
-
 #: ../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 "Älä piirrä viivoja pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12619,10 +12599,10 @@
 msgstr ""
 
-#: ../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 "Tuo äänitiedosto"
 
-#: ../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
@@ -12633,6 +12613,6 @@
 msgstr ""
 
-#: ../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
@@ -12640,10 +12620,10 @@
 msgstr ""
 
-#: ../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 "Ääniaaltotiedostot (*.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
@@ -12651,10 +12631,10 @@
 msgstr ""
 
-#: ../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 "Tuo kuvia"
 
-#: ../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
@@ -13439,5 +13419,5 @@
 msgstr "Virhe näytettäessä URL:ia"
 
-#: ../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
@@ -13447,5 +13427,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14369,5 +14349,99 @@
 msgstr "Värit"
 
-#: ../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 "Piirrä suuntanuolet"
+
+#. 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 "Vain polun päähän."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Piirrä segmenttien järjestysnumerot"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Piirrä ladatun alueen rajat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Piirrä virtuaalipisteet valintatilassa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Piirrä epäaktiiviset tasot eri värillä"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Pehmeä karttagrafiikka (antialisointi)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-pisteet"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Piirrä suuntanuolet polkujen segmenteille."
+
+#. 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 ""
+
+#. 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 "Piirrä polkujen segmenteille järjestysnumerot."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Piirrä valintatilassa virtuaalipisteet polkuihin muokkauksen helpottamiseksi."
+
+#. 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 "Piirrä epäaktiiviset tasot eri värillä."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-data"
+
+#: ../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 "Käytä globaaleja asetuksia."
+
+#: ../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
@@ -14378,10 +14452,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../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
@@ -14390,30 +14464,35 @@
 msgstr "Ei mitään"
 
-#: ../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 "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../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 "Piirrä isot GPS-pisteet."
 
-#: ../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 "Piirrä ympyrä HDOP-arvosta"
 
-#: ../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 "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../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 ""
 
-#: ../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 "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -14421,5 +14500,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"
@@ -14443,5 +14522,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
@@ -14484,5 +14563,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
@@ -14496,61 +14575,22 @@
 msgstr "Jalankulku (foot)"
 
-#: ../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 "Piirrä suuntanuolet"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
-#. 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 "Vain polun päähän."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Piirrä segmenttien järjestysnumerot"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Piirrä ladatun alueen rajat"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Piirrä virtuaalipisteet valintatilassa"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Piirrä epäaktiiviset tasot eri värillä"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Pehmeä karttagrafiikka (antialisointi)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14558,14 +14598,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14573,9 +14614,11 @@
 msgstr ""
 
-#: ../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 "Piirrä viivat GPS-pisteiden välille."
 
-#: ../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 "
@@ -14585,9 +14628,10 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../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 ""
 
-#: ../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."
@@ -14596,21 +14640,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../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 "Enimmäispituus (metreinä)"
 
 #. 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."
 msgstr ""
 
-#: ../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 "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. 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 ""
@@ -14618,5 +14661,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 "
@@ -14624,13 +14667,14 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../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 "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../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 "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../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 "
@@ -14640,13 +14684,13 @@
 "tason ominaisuuksista."
 
-#: ../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 "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14654,64 +14698,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../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 "Jäljen ja pisteiden väritys"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-pisteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Piirrä suuntanuolet polkujen segmenteille."
-
-#. 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 ""
-
-#. 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 "Piirrä polkujen segmenteille järjestysnumerot."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Piirrä valintatilassa virtuaalipisteet polkuihin muokkauksen helpottamiseksi."
-
-#. 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 "Piirrä epäaktiiviset tasot eri värillä."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16505,24 +16513,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Ladataan {0} kohde palvelimelta ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18188,5 +18196,6 @@
 msgstr "Käännöstä ei löydy: {0}. Käytetään oletusasetusta: {1}."
 
-#: ../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 ""
@@ -18195,11 +18204,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -36061,9 +36070,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36164,5 +36173,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37178,7 +37187,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Napsauta keskeyttääksesi menossa oleva toiminto"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37843,4 +37851,20 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Muokkaa viivanpiirtotyyliä"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Viivanpiirtoasetukset"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38455,7 +38479,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Piilota kohteet"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38468,14 +38491,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Käyttäjänimi: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40069,5 +40088,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}"
@@ -40075,5 +40094,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 ""
@@ -42472,11 +42491,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Valitse vähintään kaksi pistettä yhdistettäväksi tai piste joka on lähellä "
-"toista pistettä."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44563,4 +44579,7 @@
 #~ msgstr "Anna muutoskokoelman ID"
 
+#~ msgid "User name: "
+#~ msgstr "Käyttäjänimi: "
+
 #~ msgid "Opening {0} files..."
 #~ msgstr "Avataan {0} tiedostoa..."
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 26406)
+++ applications/editors/josm/i18n/po/fr.po	(revision 26428)
@@ -6,5 +6,5 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-25 17:19+0000\n"
 "Last-Translator: Casiope <Unknown>\n"
@@ -15,6 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:34+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:43+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 "X-Poedit-Language: French\n"
 
@@ -76,5 +76,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
@@ -165,5 +165,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
@@ -1219,5 +1219,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
@@ -1463,5 +1463,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"
@@ -2455,5 +2455,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
@@ -8127,5 +8127,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 "Actualisation des modèles"
@@ -9616,5 +9616,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
@@ -12638,16 +12638,16 @@
 msgstr "Personnaliser la couleur"
 
-#: ../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 "Par défaut"
 
-#: ../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 "Choisir une couleur"
 
-#: ../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
@@ -12657,6 +12657,6 @@
 msgstr "Nom : {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
@@ -12666,5 +12666,5 @@
 msgstr "Description : {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
@@ -12676,5 +12676,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
@@ -12686,16 +12686,16 @@
 msgstr "Description"
 
-#: ../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 "Durée"
 
-#: ../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 "Longueur"
 
-#: ../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
@@ -12704,6 +12704,6 @@
 msgstr "Longueur : {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
@@ -12714,6 +12714,6 @@
 msgstr[1] "{0} itinéraires, "
 
-#: ../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
@@ -12724,11 +12724,11 @@
 msgstr[1] "{0} points de passage"
 
-#: ../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 "point GPS"
 
-#: ../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
@@ -12738,10 +12738,10 @@
 msgstr[1] "{0} traces, "
 
-#: ../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 "Convertir en calque de données"
 
-#: ../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."
@@ -12751,10 +12751,10 @@
 "comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :</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
@@ -12765,7 +12765,7 @@
 msgstr "Converti depuis : {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
@@ -12776,5 +12776,5 @@
 msgstr "Télécharger le long de cette trace"
 
-#: ../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
@@ -12782,5 +12782,5 @@
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../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
@@ -12789,5 +12789,5 @@
 msgstr "{0} mètres"
 
-#: ../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
@@ -12795,5 +12795,5 @@
 msgstr "Zone maximale par requête :"
 
-#: ../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
@@ -12802,25 +12802,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 "Télécharger à proximité de :"
 
-#: ../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 "trace seulement"
 
-#: ../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 "points de passage seulement"
 
-#: ../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 "trace et points de passage"
 
-#: ../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
@@ -12833,5 +12833,5 @@
 "vous<br>continuer ?</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."
@@ -12840,5 +12840,5 @@
 "la piste audio."
 
-#: ../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 ""
@@ -12849,5 +12849,5 @@
 "la trace ont été ignorés ou déplacés au début."
 
-#: ../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 ""
@@ -12858,35 +12858,15 @@
 "leur horodatage ont été ignorés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Personnaliser le dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../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 "Tracer des lignes entre les points pour ce calque."
-
 #: ../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 "Ne pas tracer de ligne entre les points pour ce calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Sélectionner les options de dessin des lignes"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../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
@@ -12894,10 +12874,10 @@
 msgstr "Points de la trace nommés depuis {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 "Importer Audio"
 
-#: ../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
@@ -12911,6 +12891,6 @@
 "points ne sont pas horodatés.</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
@@ -12918,10 +12898,10 @@
 msgstr "Importation impossible"
 
-#: ../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 "Fichiers audio Wave (*.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
@@ -12929,10 +12909,10 @@
 msgstr "Marqueurs audio de {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 "Importer des images"
 
-#: ../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
@@ -13755,5 +13735,5 @@
 msgstr "Erreur à l’affichage de l’adresse Web"
 
-#: ../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
@@ -13765,5 +13745,5 @@
 "L’exception : {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}''..."
@@ -14808,5 +14788,101 @@
 msgstr "Couleurs"
 
-#: ../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 "Dessiner les flèches de direction"
+
+#. 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 "Seulement à l’extrémité du chemin."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Dessiner les flèches des sens uniques"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Afficher l’ordre des segments"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Afficher les limites des données téléchargées"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Afficher les nœuds virtuels dans la fenêtre de sélection"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Afficher les calques inactifs sous une autre couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Appliquer un anticrénelage"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Afficher seulement les limites des surfaces"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Données GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Dessiner les flèches de direction pour les segments de chemin."
+
+#. 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 ""
+"Dessiner les flèches de direction pour les segments de chemin en sens unique."
+
+#. 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 "Afficher l’ordre de tous les segments des chemins."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Appliquer un anticrénelage aux contours de la carte."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Afficher les limites des données téléchargées depuis le serveur."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Afficher les nœuds virtuels dans la fenêtre de sélection pour modifier plus "
+"facilement les chemins."
+
+#. 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 "Afficher les calques de données inactifs sous une autre couleur."
+
+#: ../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 "Supprimer le remplissage des surfaces et forcer le modèle sélectionné."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Données OSM"
+
+#: ../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 "Utiliser les réglages généraux."
+
+#: ../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
@@ -14817,10 +14893,10 @@
 msgstr "Tous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Les fichiers locaux"
 
-#: ../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
@@ -14829,31 +14905,36 @@
 msgstr "Aucun"
 
-#: ../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 "Forcer les lignes si aucun segment n’est importé"
 
-#: ../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 "Dessiner de gros points GPS"
 
-#: ../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 "Dessiner un cercle à partir de la valeur HDOP"
 
-#: ../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 "La vitesse (rouge = lent, vert = rapide)"
 
-#: ../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 "La direction (rouge = ouest, jaune = nord, vert = est, bleu = sud)"
 
-#: ../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 ""
 "L’atténuation de la précision (rouge = élevée, vert = faible, si disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Une seule couleur (personnalisable pour les calques nommés)"
@@ -14861,5 +14942,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"
@@ -14883,5 +14964,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
@@ -14924,5 +15005,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
@@ -14936,61 +15017,22 @@
 msgstr "Piétons"
 
-#: ../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 "Dessiner les flèches de direction"
-
-#: ../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 "Créer des marqueurs à la lecture du GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
-#. 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 "Seulement à l’extrémité du chemin."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Dessiner les flèches des sens uniques"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Afficher l’ordre des segments"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Afficher les limites des données téléchargées"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Afficher les nœuds virtuels dans la fenêtre de sélection"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Afficher les calques inactifs sous une autre couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Appliquer un anticrénelage"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Créer des marqueurs à la lecture du GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Afficher seulement les limites des surfaces"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automatiquement"
 
 #. 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"
@@ -14998,14 +15040,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 "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Les deux"
 
-#: ../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 "
@@ -15015,9 +15058,11 @@
 "à l’ouverture d’un calque GPX."
 
-#: ../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 "Tracer des lignes entre les points GPS pour :"
 
-#: ../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 "
@@ -15027,9 +15072,10 @@
 "(''-1'' pour dessiner toutes les lignes)."
 
-#: ../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 "Longueur maximale des fichiers locaux (mètres) :"
 
-#: ../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."
@@ -15038,10 +15084,10 @@
 "toutes les lignes)."
 
-#: ../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 "Longueur maximale (mètres) :"
 
 #. 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."
@@ -15050,11 +15096,10 @@
 "d’information."
 
-#: ../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 "Dessiner les flèches de direction des lignes reliant les points GPS."
 
 #. 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 ""
@@ -15063,5 +15108,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 "
@@ -15069,13 +15114,14 @@
 msgstr "Ne pas dessiner les flèches si elle ne sont pas au moins distantes."
 
-#: ../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 "Distance minimale (pixels) :"
 
-#: ../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 "Afficher de plus gros points GPS."
 
-#: ../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 "
@@ -15085,13 +15131,13 @@
 "le Gestionnaire de calques)."
 
-#: ../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 "Colorier les traces et les points en fonction de la vitesse."
 
-#: ../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 "Colorier les traces et les points en fonction de la direction."
 
-#: ../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 "
@@ -15101,66 +15147,28 @@
 "précision (HDOP). Votre appareil doit enregistrer cette information."
 
-#: ../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 ""
+
+#. 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 "Colorier les traces et les points en fonction du type de véhicule."
 
-#: ../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 "Colorier les traces et les points selon :"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Nommer les points de passage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Données GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Dessiner les flèches de direction pour les segments de chemin."
-
-#. 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 ""
-"Dessiner les flèches de direction pour les segments de chemin en sens unique."
-
-#. 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 "Afficher l’ordre de tous les segments des chemins."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Appliquer un anticrénelage aux contours de la carte."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Afficher les limites des données téléchargées depuis le serveur."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Afficher les nœuds virtuels dans la fenêtre de sélection pour modifier plus "
-"facilement les chemins."
-
-#. 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 "Afficher les calques de données inactifs sous une autre couleur."
-
-#: ../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 "Supprimer le remplissage des surfaces et forcer le modèle sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Données OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17070,27 +17078,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Téléchargement de la relation ''{0}''"
+msgstr ""
 
 #: ../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 ""
-"Attention : la lecture du message du jour depuis ''{0}'' a échoué. "
-"Exception : {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18936,5 +18942,6 @@
 "{1}."
 
-#: ../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 ""
@@ -18945,5 +18952,5 @@
 "important problème de configuration. JOSM va être arrêté."
 
-#: ../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}"
@@ -18951,6 +18958,6 @@
 "Attention : l’ouverture du fichier zip ''{0}'' a échoué. Exception : {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 ""
@@ -36923,9 +36930,9 @@
 msgstr "Afficher les adresses incomplètes"
 
-#: ../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 "articles"
 
-#: ../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 "aucun objet"
@@ -37029,5 +37036,5 @@
 msgstr "Sélectionner toutes les adresses incomplètes"
 
-#: ../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 "Propriétés du calque"
@@ -38046,7 +38053,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Enregistrer automatiquement le calque"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38150,7 +38156,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Annuler le téléchargement (images vectorielles seulement)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38847,4 +38852,20 @@
 "comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Personnaliser le dessin des lignes"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Tracer des lignes entre les points pour ce calque."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Ne pas tracer de ligne entre les points pour ce calque."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Sélectionner les options de dessin des lignes"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39459,12 +39480,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Masquer ce bouton"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Masquer ce bouton"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -39473,14 +39492,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Piste grade 1"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -41104,5 +41119,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}"
@@ -41110,5 +41125,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 : "
@@ -43615,11 +43630,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Veuillez sélectionner au moins deux nœuds à fusionner, ou un nœud proche "
-"d’un autre."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44557,4 +44569,7 @@
 #~ msgid "Cycleway"
 #~ msgstr "Voie cyclable"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Piste grade 1"
 
 #~ msgid "Track Grade 2"
@@ -47647,4 +47662,7 @@
 #~ msgstr "UTM 20N (France)"
 
+#~ msgid "Downloading relation ''{0}''"
+#~ msgstr "Téléchargement de la relation ''{0}''"
+
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 26406)
+++ applications/editors/josm/i18n/po/gl.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 17:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:37+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:47+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
@@ -161,5 +161,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
@@ -397,5 +397,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
@@ -1207,5 +1207,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
@@ -1438,5 +1438,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"
@@ -2425,5 +2425,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
@@ -8024,5 +8024,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 ""
@@ -9508,5 +9508,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
@@ -12367,16 +12367,16 @@
 msgstr "Personalizar Cor"
 
-#: ../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 "Predeterminado"
 
-#: ../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 "Escolle unha cor"
 
-#: ../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
@@ -12386,6 +12386,6 @@
 msgstr "Nome: {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
@@ -12395,5 +12395,5 @@
 msgstr "Descrición: {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
@@ -12405,5 +12405,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
@@ -12415,16 +12415,16 @@
 msgstr "Descrición"
 
-#: ../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 ""
 
-#: ../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 "Lonxitude"
 
-#: ../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
@@ -12433,6 +12433,6 @@
 msgstr "Lonxitude: {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
@@ -12443,6 +12443,6 @@
 msgstr[1] "{0} rutas, "
 
-#: ../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
@@ -12453,11 +12453,11 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../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 "punto gps"
 
-#: ../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
@@ -12467,10 +12467,10 @@
 msgstr[1] "{0} trazados, "
 
-#: ../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 "Convertir en capa de datos"
 
-#: ../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."
@@ -12478,10 +12478,10 @@
 msgstr ""
 
-#: ../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
@@ -12492,7 +12492,7 @@
 msgstr "Convertido de: {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
@@ -12503,5 +12503,5 @@
 msgstr "Descargar de OSM ó longo desta pista"
 
-#: ../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
@@ -12509,5 +12509,5 @@
 msgstr "Descargar todo o que abarca:"
 
-#: ../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
@@ -12516,5 +12516,5 @@
 msgstr "{0} metros"
 
-#: ../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
@@ -12522,5 +12522,5 @@
 msgstr "Área máxima por petición:"
 
-#: ../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
@@ -12529,25 +12529,25 @@
 msgstr "{0} km cad."
 
-#: ../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 ""
 
-#: ../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 "só via"
 
-#: ../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 "só puntos de vía"
 
-#: ../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 "pista e puntos de vía"
 
-#: ../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
@@ -12560,10 +12560,10 @@
 "Desexas<br>continuar?</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."
 msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../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 ""
@@ -12574,5 +12574,5 @@
 "posteriores ó fin foron omitidos ou movidos ó inicio."
 
-#: ../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 ""
@@ -12583,35 +12583,15 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Personalizar debuxo de liñas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Usar configuración global."
-
-#: ../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 "Debuxar liñas entre puntos para esta capa."
-
 #: ../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 "Non debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Escoller as opcións de liña do debuxo"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Marca dos puntos con nome"
 
-#: ../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
@@ -12619,10 +12599,10 @@
 msgstr "Puntos de trazado con nome de {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 "Importar Audio"
 
-#: ../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
@@ -12633,6 +12613,6 @@
 msgstr ""
 
-#: ../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
@@ -12640,10 +12620,10 @@
 msgstr ""
 
-#: ../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 "Ficheiros Wave Audio (*.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
@@ -12651,10 +12631,10 @@
 msgstr "Marcas de audio de {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 "Importar imaxes"
 
-#: ../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
@@ -13434,5 +13414,5 @@
 msgstr "Erro amosando a 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
@@ -13442,5 +13422,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14390,5 +14370,102 @@
 msgstr "Cores"
 
-#: ../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 "Debuxar Frechas de Dirección"
+
+#. 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 "Só no extremo da vía."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Debuxar os números de orde dos segmentos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Debuxar os límites dos datos descargados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Debuxar nodos virtuais no modo de selección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Debuxar as capas inactivas en outra cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Gráficos de mapa suaves (filtro antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Puntos GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Debuxar consellos de dirección para segmentos de vía."
+
+#. 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 ""
+
+#. 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 "Debuxar os números de orde de todos os segmentos dentro da súa liña."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Aplicar filtros antialiasing á vista do mapa para acadar unha apariencia "
+"máis suave."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Debuxar os límites dos datos cargados dende o servidor."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Debuxar nodos virtuais no modo de selección para unha modificación de vía "
+"máis doada."
+
+#. 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 "Debuxar as capas de datos inactivas nunha cor diferente."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Datos OSM"
+
+#: ../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 "Usar configuración global."
+
+#: ../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
@@ -14399,10 +14476,10 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Ficheiros locais"
 
-#: ../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
@@ -14411,30 +14488,35 @@
 msgstr "Ningún"
 
-#: ../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 "Forzar liñas se non se importou ningún segmento."
 
-#: ../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 "Debuxar puntos GPS grandes."
 
-#: ../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 "Debuxa un novo círculo a partir de un valor HDOP."
 
-#: ../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 "Velocidade (vermello = lento, verde = rápido)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -14442,5 +14524,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"
@@ -14464,5 +14546,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
@@ -14505,5 +14587,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
@@ -14517,61 +14599,22 @@
 msgstr "Pé"
 
-#: ../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 "Debuxar Frechas de Dirección"
-
-#: ../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 "Crear marcadores cando se leen GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
-#. 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 "Só no extremo da vía."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Debuxar os números de orde dos segmentos"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Debuxar os límites dos datos descargados"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Debuxar nodos virtuais no modo de selección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Debuxar as capas inactivas en outra cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Gráficos de mapa suaves (filtro antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Crear marcadores cando se leen GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Auto"
 
 #. 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"
@@ -14579,14 +14622,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 "Desc(ripcion)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Ambos"
 
-#: ../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 "
@@ -14596,9 +14640,11 @@
 "se abra unha capa GPX."
 
-#: ../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 "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../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 "
@@ -14608,9 +14654,10 @@
 "todas as liñas."
 
-#: ../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 "Lonxitude máxima para os ficheiros locais (metros)"
 
-#: ../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."
@@ -14619,10 +14666,10 @@
 "todas as liñas."
 
-#: ../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 "Lonxitude máxima (metros)"
 
 #. 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."
@@ -14631,11 +14678,10 @@
 "de liñas."
 
-#: ../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 "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. 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 ""
@@ -14644,5 +14690,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 "
@@ -14652,13 +14698,14 @@
 "da anterior."
 
-#: ../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 "Distancia mínima (pixeles)"
 
-#: ../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 "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../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 "
@@ -14668,13 +14715,13 @@
 "personalizados no Xestor de Capas."
 
-#: ../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 "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14682,68 +14729,29 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../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 "Coloreado de Trazados e Puntos"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Puntos GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Debuxar consellos de dirección para segmentos de vía."
-
-#. 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 ""
-
-#. 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 "Debuxar os números de orde de todos os segmentos dentro da súa liña."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Aplicar filtros antialiasing á vista do mapa para acadar unha apariencia "
-"máis suave."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Debuxar os límites dos datos cargados dende o servidor."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Debuxar nodos virtuais no modo de selección para unha modificación de vía "
-"máis doada."
-
-#. 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 "Debuxar as capas de datos inactivas nunha cor diferente."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Datos OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16536,24 +16544,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Enviar a \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18247,5 +18255,6 @@
 "Non se puido atopar traducción para a localización {0}. Volvendo a {1}."
 
-#: ../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 ""
@@ -18254,11 +18263,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -36159,9 +36168,9 @@
 msgstr ""
 
-#: ../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 "elementos"
 
-#: ../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 "sen elementos"
@@ -36260,5 +36269,5 @@
 msgstr ""
 
-#: ../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 "Propriedades da Capa"
@@ -37187,7 +37196,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Activar caché automática."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37283,7 +37291,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Prema para cancelar a operación actual"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37952,4 +37959,20 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Personalizar debuxo de liñas"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Debuxar liñas entre puntos para esta capa."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Non debuxar liñas entre puntos para esta capa."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Escoller as opcións de liña do debuxo"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38564,12 +38587,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Agochar este botón"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Agochar este botón"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38578,14 +38599,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Nome da rúa: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40170,5 +40187,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}"
@@ -40176,5 +40193,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 ""
@@ -42584,9 +42601,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43925,4 +43941,7 @@
 #~ msgid "An error occurred while saving."
 #~ msgstr "Ocurriu un erro mentres se gardaba."
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
 #~ msgid "None of this way's nodes are glued to anything else."
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 26406)
+++ applications/editors/josm/i18n/po/he.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:20+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:23+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:34+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
@@ -161,5 +161,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
@@ -397,5 +397,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
@@ -1199,5 +1199,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
@@ -1425,5 +1425,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"
@@ -2364,5 +2364,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
@@ -7764,5 +7764,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 ""
@@ -9236,5 +9236,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
@@ -12007,16 +12007,16 @@
 msgstr "התאם צבעים"
 
-#: ../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 "ברירת מחדל"
 
-#: ../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 "בחר צבע"
 
-#: ../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
@@ -12026,6 +12026,6 @@
 msgstr "שם: {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
@@ -12035,5 +12035,5 @@
 msgstr "תיאור: {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
@@ -12045,5 +12045,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
@@ -12055,16 +12055,16 @@
 msgstr "תיאור"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12073,6 +12073,6 @@
 msgstr ""
 
-#: ../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
@@ -12083,6 +12083,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -12093,11 +12093,11 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../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"
 
-#: ../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
@@ -12107,10 +12107,10 @@
 msgstr[1] ""
 
-#: ../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 "המר לשכבת נתונים"
 
-#: ../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."
@@ -12118,10 +12118,10 @@
 msgstr ""
 
-#: ../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
@@ -12132,7 +12132,7 @@
 msgstr "המר מ: {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
@@ -12143,5 +12143,5 @@
 msgstr ""
 
-#: ../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
@@ -12149,5 +12149,5 @@
 msgstr "הורד הכל עם:"
 
-#: ../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
@@ -12156,5 +12156,5 @@
 msgstr "{0} מטרים"
 
-#: ../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
@@ -12162,5 +12162,5 @@
 msgstr "שטח מירבי לבקשה"
 
-#: ../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
@@ -12169,25 +12169,25 @@
 msgstr "{0} קמ\"ר"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12200,10 +12200,10 @@
 "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."
 msgstr ""
 
-#: ../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 ""
@@ -12212,5 +12212,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12221,35 +12221,15 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "התאם ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "השתמש בהגדרות הגלובליות."
-
-#: ../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 "צייר קווים בין נקודות בשכבה זו."
-
 #: ../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 "אל תצייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../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
@@ -12257,10 +12237,10 @@
 msgstr ""
 
-#: ../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 "ייבא שמע"
 
-#: ../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
@@ -12271,6 +12251,6 @@
 msgstr ""
 
-#: ../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
@@ -12278,10 +12258,10 @@
 msgstr ""
 
-#: ../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 "קובץ שמע (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
@@ -12289,10 +12269,10 @@
 msgstr "סמן שמע מ {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 "ייבא תמונות"
 
-#: ../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
@@ -13074,5 +13054,5 @@
 msgstr "שגיאה בהצגת 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
@@ -13082,5 +13062,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14002,5 +13982,98 @@
 msgstr "צבעים"
 
-#: ../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 "צייר חיצי כיוון"
+
+#. 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 "רק בראשית הדרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "צייר מספרים סידוריים של קטע"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "צייר גבולות של נתונים שהורדו"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "צייר נקודות וירטואליות במצב הנבחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "צייר שכבות לא פעילות בצבע שונה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "החלק גרפיקה של מפה (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "נקודות GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "צייר רמזי כיוון עבור קטעי דרך."
+
+#. 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 ""
+
+#. 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 "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "צייר את גבולות המידע שמורד מהשרת."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
+
+#. 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 "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "נתוני OSM"
+
+#: ../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 "השתמש בהגדרות הגלובליות."
+
+#: ../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
@@ -14011,10 +14084,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14023,30 +14096,35 @@
 msgstr ""
 
-#: ../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 "הכרח קווים במידה ולא יובאו מקטעים."
 
-#: ../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 "צייר נקודות GPS גדולות."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14054,5 +14132,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"
@@ -14076,5 +14154,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
@@ -14117,5 +14195,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
@@ -14129,61 +14207,22 @@
 msgstr "רגל"
 
-#: ../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 "צייר חיצי כיוון"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
-#. 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 "רק בראשית הדרך"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "צייר מספרים סידוריים של קטע"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "צייר גבולות של נתונים שהורדו"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "צייר נקודות וירטואליות במצב הנבחר"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "צייר שכבות לא פעילות בצבע שונה"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "החלק גרפיקה של מפה (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14191,14 +14230,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14206,9 +14246,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14216,35 +14258,35 @@
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../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 ""
 
-#: ../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."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../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 "אורך מירבי (מטרים)"
 
 #. 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."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../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 "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. 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 "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. 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 "
@@ -14252,13 +14294,14 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../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 "מרחק מינימלי (פיקסלים)"
 
-#: ../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 "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../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 "
@@ -14266,13 +14309,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14280,63 +14323,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "נקודות GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "צייר רמזי כיוון עבור קטעי דרך."
-
-#. 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 ""
-
-#. 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 "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "צייר את גבולות המידע שמורד מהשרת."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
-
-#. 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 "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "נתוני OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16117,24 +16125,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "הורד משטח WMS מ-{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17749,5 +17757,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17756,11 +17765,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35613,9 +35622,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35714,5 +35723,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37383,4 +37392,20 @@
 "מסלולים, ראה כאן:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "התאם ציור קו"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "צייר קווים בין נקודות בשכבה זו."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "אל תצייר קווים בין נקודות בשכבה זו."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "בחר אפשרויות ציור קו"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38007,9 +38032,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} קמ\"ש"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
@@ -39595,5 +39617,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}"
@@ -39601,5 +39623,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 ""
@@ -41995,9 +42017,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "אנא בחר לפחות שני צמתים למיזוג."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42748,4 +42769,7 @@
 #~ msgid "Drag a way segment to make a rectangle."
 #~ msgstr "גרור מקטע דרך ליצירת מרובע"
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
 #~ msgid ""
@@ -43158,4 +43182,7 @@
 #~ msgstr "מיקום רשת מקורי"
 
+#~ msgid "Download WMS tile from {0}"
+#~ msgstr "הורד משטח WMS מ-{0}"
+
 #~ msgid "Please select the row to copy."
 #~ msgstr "בחר שורה להעתקה"
Index: applications/editors/josm/i18n/po/id.po
===================================================================
--- applications/editors/josm/i18n/po/id.po	(revision 26406)
+++ applications/editors/josm/i18n/po/id.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-21 15:31+0000\n"
 "Last-Translator: Vasanthi <Unknown>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:33+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:43+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
@@ -165,5 +165,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
@@ -405,5 +405,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
@@ -1222,5 +1222,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
@@ -1461,5 +1461,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"
@@ -2449,5 +2449,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
@@ -7904,5 +7904,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 ""
@@ -9376,5 +9376,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
@@ -12151,16 +12151,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Pilih sebuah warna"
 
-#: ../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
@@ -12170,6 +12170,6 @@
 msgstr "Nama: {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
@@ -12179,5 +12179,5 @@
 msgstr ""
 
-#: ../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
@@ -12189,5 +12189,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
@@ -12199,16 +12199,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Panjang"
 
-#: ../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
@@ -12217,6 +12217,6 @@
 msgstr "Panjang: {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
@@ -12227,6 +12227,6 @@
 msgstr[1] ""
 
-#: ../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
@@ -12237,11 +12237,11 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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
@@ -12251,10 +12251,10 @@
 msgstr[1] ""
 
-#: ../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 ""
 
-#: ../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."
@@ -12262,10 +12262,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12276,7 +12276,7 @@
 msgstr ""
 
-#: ../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
@@ -12287,5 +12287,5 @@
 msgstr "Download dari OSM sepanjang track ini"
 
-#: ../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
@@ -12293,5 +12293,5 @@
 msgstr "Download semua sejauh:"
 
-#: ../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
@@ -12300,5 +12300,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
@@ -12306,5 +12306,5 @@
 msgstr ""
 
-#: ../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
@@ -12313,25 +12313,25 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12342,10 +12342,10 @@
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
@@ -12354,5 +12354,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12361,35 +12361,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../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 ""
-
 #: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12397,10 +12377,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12411,6 +12391,6 @@
 msgstr ""
 
-#: ../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
@@ -12418,10 +12398,10 @@
 msgstr ""
 
-#: ../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 "Wave Audio files (*.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
@@ -12429,10 +12409,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -13210,5 +13190,5 @@
 msgstr ""
 
-#: ../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
@@ -13218,5 +13198,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14138,5 +14118,98 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
@@ -14147,10 +14220,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14159,30 +14232,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14190,5 +14268,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"
@@ -14212,5 +14290,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
@@ -14253,5 +14331,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
@@ -14265,61 +14343,22 @@
 msgstr "Pejalan Kaki"
 
-#: ../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 ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#. 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14327,14 +14366,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14342,9 +14382,11 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14352,35 +14394,35 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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 ""
 
 #. 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 "
@@ -14388,13 +14430,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14402,13 +14445,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14416,62 +14459,27 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
 msgstr ""
 
@@ -16253,24 +16261,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Upload ke \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17885,5 +17893,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17892,11 +17901,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35745,9 +35754,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35846,5 +35855,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36853,7 +36862,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klikuntuk membatalkan operasi saat ini"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37514,4 +37522,20 @@
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38126,12 +38150,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Sembunyikan tombol ini"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Sembunyikan tombol ini"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38140,14 +38162,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/jam"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Nama penanda: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39725,5 +39743,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}"
@@ -39731,5 +39749,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 ""
@@ -42125,11 +42143,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Mohon pilih paling tidak dua node untuk digabungkan atau sebuah node yang "
-"dekat dengan node lainnya."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 26406)
+++ applications/editors/josm/i18n/po/is.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2010-11-27 04:37+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\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:22+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:33+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
@@ -161,5 +161,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
@@ -393,5 +393,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
@@ -1199,5 +1199,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
@@ -1425,5 +1425,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"
@@ -2369,5 +2369,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
@@ -7751,5 +7751,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 ""
@@ -9225,5 +9225,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
@@ -12003,16 +12003,16 @@
 msgstr "Sérsníða liti"
 
-#: ../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 ""
 
-#: ../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 "Veldu lit"
 
-#: ../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
@@ -12022,6 +12022,6 @@
 msgstr ""
 
-#: ../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
@@ -12031,5 +12031,5 @@
 msgstr ""
 
-#: ../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
@@ -12041,5 +12041,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
@@ -12051,16 +12051,16 @@
 msgstr "Lýsing"
 
-#: ../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 "Tímaspan"
 
-#: ../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 "Lengd"
 
-#: ../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
@@ -12069,6 +12069,6 @@
 msgstr ""
 
-#: ../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
@@ -12079,6 +12079,6 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../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
@@ -12089,11 +12089,11 @@
 msgstr[1] "{0} punktar"
 
-#: ../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 ""
 
-#: ../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
@@ -12103,10 +12103,10 @@
 msgstr[1] "{0} ferlar, "
 
-#: ../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 "Breyta í gagnalag"
 
-#: ../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."
@@ -12114,10 +12114,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12128,7 +12128,7 @@
 msgstr ""
 
-#: ../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
@@ -12139,5 +12139,5 @@
 msgstr ""
 
-#: ../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
@@ -12145,5 +12145,5 @@
 msgstr ""
 
-#: ../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
@@ -12152,5 +12152,5 @@
 msgstr ""
 
-#: ../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
@@ -12158,5 +12158,5 @@
 msgstr ""
 
-#: ../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
@@ -12165,25 +12165,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12194,10 +12194,10 @@
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
@@ -12206,5 +12206,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12213,35 +12213,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Sérsníða teikningu lína"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../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 ""
-
 #: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../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
@@ -12249,10 +12229,10 @@
 msgstr ""
 
-#: ../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 "Flytja inn hljóð"
 
-#: ../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
@@ -12263,6 +12243,6 @@
 msgstr ""
 
-#: ../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
@@ -12270,10 +12250,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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
@@ -12281,10 +12261,10 @@
 msgstr ""
 
-#: ../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 "Flytja inn myndir"
 
-#: ../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
@@ -13058,5 +13038,5 @@
 msgstr ""
 
-#: ../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
@@ -13066,5 +13046,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -13986,5 +13966,98 @@
 msgstr "Litir"
 
-#: ../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 ""
+
+#. 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS punktar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr ""
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM gögn"
+
+#: ../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 ""
+
+#: ../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
@@ -13995,10 +14068,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Fyrir staðværar skrár"
 
-#: ../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
@@ -14007,30 +14080,35 @@
 msgstr "Aldrei"
 
-#: ../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 ""
 
-#: ../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 "Teikna stóra GPS punkta."
 
-#: ../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 ""
 
-#: ../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 "Hraði (rauður = hægari, grænn = hraðari)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14038,5 +14116,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"
@@ -14060,5 +14138,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
@@ -14101,5 +14179,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
@@ -14113,61 +14191,22 @@
 msgstr "Fótgangandi"
 
-#: ../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 ""
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#. 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14175,14 +14214,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14190,9 +14230,11 @@
 msgstr ""
 
-#: ../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 "Teikna línu á milli GPS punkta"
 
-#: ../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 "
@@ -14202,9 +14244,10 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../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 "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
-#: ../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."
@@ -14213,26 +14256,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../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 "Hámarkslengt milli punkta (í metrum)"
 
 #. 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."
 msgstr ""
 
-#: ../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 ""
 
 #. 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 ""
 
 #. 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 "
@@ -14240,13 +14282,14 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14254,13 +14297,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14268,63 +14311,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS punktar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr ""
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-
-#. 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 ""
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM gögn"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16104,13 +16112,14 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
@@ -16122,6 +16131,5 @@
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17737,5 +17745,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17744,11 +17753,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35599,9 +35608,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35700,5 +35709,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36707,7 +36716,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Smelltu til að hætta við aðgerðina"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37368,4 +37376,20 @@
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Sérsníða teikningu lína"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39573,5 +39597,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}"
@@ -39579,5 +39603,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 ""
@@ -41973,9 +41997,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Veldu minnst tvo hnúta til að sameina."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43283,4 +43306,7 @@
 #~ msgid "Delete all"
 #~ msgstr "Eyða öllum lögunum"
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Veldu minnst tvo hnúta til að sameina."
 
 #~ msgid "Merge nodes with different memberships?"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 26406)
+++ applications/editors/josm/i18n/po/it.po	(revision 26428)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
-"PO-Revision-Date: 2011-07-21 12:00+0000\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"PO-Revision-Date: 2011-07-28 09:21+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -14,6 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:34+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:46+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -74,5 +74,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
@@ -163,5 +163,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
@@ -1225,5 +1225,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
@@ -1475,5 +1475,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"
@@ -2477,5 +2477,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
@@ -8277,5 +8277,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 "Ricaricamento delle sorgenti di stile in corso"
@@ -9779,5 +9779,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
@@ -12875,16 +12875,16 @@
 msgstr "Personalizza colori"
 
-#: ../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 "Predefinito"
 
-#: ../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 "Scegli un colore"
 
-#: ../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
@@ -12894,6 +12894,6 @@
 msgstr "Nome: {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
@@ -12903,5 +12903,5 @@
 msgstr "Descrizione: {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
@@ -12913,5 +12913,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
@@ -12923,16 +12923,16 @@
 msgstr "Descrizione"
 
-#: ../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 "Differenza temporale"
 
-#: ../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 "Lunghezza"
 
-#: ../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
@@ -12941,6 +12941,6 @@
 msgstr "Lunghezza: {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
@@ -12951,6 +12951,6 @@
 msgstr[1] "{0} itinerari, "
 
-#: ../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
@@ -12961,11 +12961,11 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../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 "punto GPS"
 
-#: ../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
@@ -12975,10 +12975,10 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../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 "Converti in livello dati"
 
-#: ../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."
@@ -12989,10 +12989,10 @@
 "vedere qui:</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
@@ -13003,7 +13003,7 @@
 msgstr "Convertito da: {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
@@ -13014,5 +13014,5 @@
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../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
@@ -13020,5 +13020,5 @@
 msgstr "Scarica tutto entro:"
 
-#: ../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
@@ -13027,5 +13027,5 @@
 msgstr "{0} metri"
 
-#: ../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
@@ -13033,5 +13033,5 @@
 msgstr "Area massima per richiesta:"
 
-#: ../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
@@ -13040,25 +13040,25 @@
 msgstr "{0} km quadrati"
 
-#: ../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 "Scarica vicino:"
 
-#: ../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 "solo tracciato"
 
-#: ../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 "solo punti del percorso"
 
-#: ../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 "tracciato e punti del percorso"
 
-#: ../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
@@ -13071,10 +13071,10 @@
 "vuole procedere?</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."
 msgstr "Nessuna traccia GPX da associare con l''audio."
 
-#: ../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 ""
@@ -13086,5 +13086,5 @@
 "all''inizio."
 
-#: ../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 ""
@@ -13095,35 +13095,15 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Personalizza disegno linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Usa le impostazioni globali."
-
-#: ../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 "Disegna le linee tra i punti di questo livello."
-
 #: ../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 "Non disegnare le linee tra i punti di questo livello."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Seleziona le opzioni per il disegno delle linee"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../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
@@ -13131,10 +13111,10 @@
 msgstr "Nomina i punti del percorso da {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 "Importa l''audio"
 
-#: ../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
@@ -13148,6 +13128,6 @@
 "possibile correlarli con la traccia audio.</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
@@ -13155,10 +13135,10 @@
 msgstr "Importazione non possibile"
 
-#: ../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 "Files audio Wave (*.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
@@ -13166,10 +13146,10 @@
 msgstr "Marcatori audio da {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 "Importa immagini"
 
-#: ../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
@@ -13994,5 +13974,5 @@
 msgstr "Impossibile visualizzare l''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
@@ -14004,5 +13984,5 @@
 "L''eccezione è stata: {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}''..."
@@ -15080,5 +15060,107 @@
 msgstr "Colori"
 
-#: ../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 "Disegna le frecce di direzione"
+
+#. 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 "Solo sull''estremità di un percorso."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Disegna le frecce dei sensi unici."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Disegna i numeri d''ordine dei segmenti"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Disegna i confini dei dati scaricati"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Disegna dei nodi virtuali nella modalità selezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Disegna con altri colori i layer non attivi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Grafica della mappa migliorata (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Disegna solamente i perimetri delle aree"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Punti GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Disegna il verso sui segmenti dei percorsi."
+
+#. 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 ""
+"Disegna le frecce di direzione dei sensi unici e di altre caratteristiche "
+"contraddistinte da un verso."
+
+#. 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 ""
+"Disegna i numeri d''ordine per tutti i segmenti all''interno del loro "
+"percorso."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Applicando l''antialiasing alla mappa, la visualizzazione risulterà migliore."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Disegna i confini dei dati scaricati dal server."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Disegna nodi virtuali in modalità selezione per una facile modifica del "
+"percorso."
+
+#. 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 "Disegna con un colore diverso i layer non attivi."
+
+#: ../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 ""
+"Questa opzione sopprime il riempimento delle aree, ignorando qualsiasi "
+"impostazione presente nello stile selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Dati OSM"
+
+#: ../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 "Usa le impostazioni globali."
+
+#: ../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
@@ -15089,10 +15171,10 @@
 msgstr "Tutti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "File locali"
 
-#: ../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
@@ -15101,31 +15183,36 @@
 msgstr "Nessuno"
 
-#: ../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 "Forza le linee se nessun segmento è stato importato."
 
-#: ../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 "Disegna dei punti GPS grandi."
 
-#: ../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 "Disegna un cerchio in base al valore HDOP."
 
-#: ../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 "Velocità (rosso = lento, verde = veloce)"
 
-#: ../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 "Direzione (rosso = ovest, giallo = nord, verde = est, blu = sud)"
 
-#: ../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 ""
 "Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -15133,5 +15220,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"
@@ -15155,5 +15242,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
@@ -15196,5 +15283,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
@@ -15208,61 +15295,22 @@
 msgstr "Pedone"
 
-#: ../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 "Disegna le frecce di direzione"
-
-#: ../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 "Crea marcatori durante la lettura del tracciato GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
-#. 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 "Solo sull''estremità di un percorso."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Disegna le frecce dei sensi unici."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Disegna i numeri d''ordine dei segmenti"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Disegna i confini dei dati scaricati"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Disegna dei nodi virtuali nella modalità selezione"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Disegna con altri colori i layer non attivi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Grafica della mappa migliorata (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Crea marcatori durante la lettura del tracciato GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Disegna solamente i perimetri delle aree"
-
-#: ../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 "Intervallo di colore dinamico basato sui limiti dei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automatico"
 
 #. 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"
@@ -15270,14 +15318,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 "Desc(rizione)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../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 "
@@ -15287,9 +15336,11 @@
 "per ogni punto del percorso."
 
-#: ../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 "Disegna le linee tra i punti GPS grezzi"
 
-#: ../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 "
@@ -15299,9 +15350,10 @@
 "Usare ''-1'' per disegnare qualsiasi linea."
 
-#: ../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 "Lunghezza massima per i file locali (metri)"
 
-#: ../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."
@@ -15310,10 +15362,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../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 "Lunghezza massima (metri)"
 
 #. 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."
@@ -15322,6 +15374,5 @@
 "sulle linee."
 
-#: ../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 ""
@@ -15329,5 +15380,5 @@
 
 #. 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 ""
@@ -15336,5 +15387,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 "
@@ -15342,13 +15393,14 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../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 "Distanza minima (in 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 "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../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 "
@@ -15358,13 +15410,13 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../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 "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../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 "Colora i punti ed i segmenti di tracciato secondo la direzione."
 
-#: ../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 "
@@ -15375,5 +15427,10 @@
 "registrare queste informazioni."
 
-#: ../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 ""
+
+#. 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 ""
@@ -15381,68 +15438,19 @@
 "velocità medie."
 
-#: ../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 "Colorazione del tracciato e del punto"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Etichettatura dei punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Punti GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Disegna il verso sui segmenti dei percorsi."
-
-#. 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 ""
-"Disegna le frecce di direzione dei sensi unici e di altre caratteristiche "
-"contraddistinte da un verso."
-
-#. 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 ""
-"Disegna i numeri d''ordine per tutti i segmenti all''interno del loro "
-"percorso."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Applicando l''antialiasing alla mappa, la visualizzazione risulterà migliore."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Disegna i confini dei dati scaricati dal server."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Disegna nodi virtuali in modalità selezione per una facile modifica del "
-"percorso."
-
-#. 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 "Disegna con un colore diverso i layer non attivi."
-
-#: ../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 ""
-"Questa opzione sopprime il riempimento delle aree, ignorando qualsiasi "
-"impostazione presente nello stile selezionato."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Dati OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17415,27 +17423,25 @@
 "prossima volta: {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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Scaricamento di {0} oggetto da ''''{1}''''"
+msgstr "Scaricamento reindirizzato verso ''{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 ""
-"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
-"L''eccezione è stata: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -19304,5 +19310,6 @@
 "{1}"
 
-#: ../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 ""
@@ -19313,5 +19320,5 @@
 "serio problema di configurazione. JOSM terminerà di funzionare."
 
-#: ../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}"
@@ -19320,6 +19327,6 @@
 "{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 ""
@@ -37337,9 +37344,9 @@
 msgstr "Visualizza gli indirizzi incompleti"
 
-#: ../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 "elementi"
 
-#: ../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 "nessun elemento"
@@ -37443,5 +37450,5 @@
 msgstr "Seleziona tutti gli indirizzi con dati incompleti."
 
-#: ../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 "Proprietà del livello"
@@ -38489,7 +38496,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Abilita la cache automatica."
+msgstr "Permette un caching automatico"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38594,7 +38600,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Annulla il trascinamento corrente (solo immagini vettoriali)"
+msgstr "Annulla il trascinamento corrente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38794,5 +38799,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:21
 msgid "Save image as PNG"
-msgstr ""
+msgstr "Salva immagine in formato PNG"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:38
@@ -39294,4 +39299,20 @@
 "tracciati, vedere qui:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Personalizza disegno linee"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Disegna le linee tra i punti di questo livello."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Non disegnare le linee tra i punti di questo livello."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Seleziona le opzioni per il disegno delle linee"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39937,28 +39958,22 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Nascondi questo tasto"
+msgstr "Nascondi questo"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Nascondi questo tasto"
+msgstr "Nascondi questo&più vecchi"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
 msgid "No timestamp"
-msgstr ""
+msgstr "Nessuna marcatura temporale"
 
 #: ../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 "Track Grade 3"
+msgstr "Nome del tracciato: "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40700,4 +40715,5 @@
 msgid "Transfer to password manager and remove from prefence file"
 msgstr ""
+"Trasferisci al gestore delle password ed elimina dal file delle preferenze"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
@@ -41610,5 +41626,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}"
@@ -41616,5 +41632,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: "
@@ -44167,13 +44183,13 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:85
 msgid "Symmetry"
-msgstr ""
+msgstr "Simmetria"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Selezionare almeno due nodi da unire oppure un nodo vicino ad un altro nodo."
+"Selezionare almeno due nodi per definire l''asse di simmetria e "
+"qualcos''altro da riflettere."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44709,7 +44725,4 @@
 msgid "Drive a race car on this layer"
 msgstr "Guida una macchina da corsa su questo livello"
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Cancella e trasferisci nel gestore delle password"
 
 #~ msgid "No data imported."
@@ -45699,4 +45712,7 @@
 #~ msgid "zoom"
 #~ msgstr "livello di ingrandimento"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
 
 #~ msgid "Track Grade 2"
@@ -51555,2 +51571,24 @@
 #~ "l’unità \"m\", \"km\", \"mi\" oppure senza unità.\n"
 #~ "In alternativa può essere utilizzato il formato FEET'' INCHES\"."
+
+#~ msgid "Erase and transfer to password manager"
+#~ msgstr "Cancella e trasferisci nel gestore delle password"
+
+#~ msgid ""
+#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
+#~ "'Location' header. Can''t redirect. Aborting."
+#~ msgstr ""
+#~ "Errore grave: risposta non prevista dal server HTTP. E'' stata ottenuta "
+#~ "la risposta {0} senza la testata ''Location''. Impossibile reindirizzare. "
+#~ "Esecuzione interrotta."
+
+#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
+#~ msgstr ""
+#~ "Errore grave: sono stati rilevati troppi reindirizzamenti all''indirizzo "
+#~ "URL di scarico. Esecuzione interrotta."
+
+#~ msgid ""
+#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
+#~ msgstr ""
+#~ "Errore: fallita la lettura da ''{0}''. Il server ha risposto con il "
+#~ "codice {1}."
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 26406)
+++ applications/editors/josm/i18n/po/ja.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-24 21:33+0000\n"
 "Last-Translator: ribbon <Unknown>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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:49+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Language: Japanese\n"
@@ -80,5 +80,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
@@ -168,5 +168,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
@@ -406,5 +406,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
@@ -1216,5 +1216,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
@@ -1456,5 +1456,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"
@@ -2428,5 +2428,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
@@ -7940,5 +7940,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 "スタイルのソースを再読み込み中"
@@ -9421,5 +9421,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
@@ -12327,16 +12327,16 @@
 msgstr "配色のカスタマイズ"
 
-#: ../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 "既定"
 
-#: ../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 "色選択"
 
-#: ../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
@@ -12346,6 +12346,6 @@
 msgstr "名前: {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
@@ -12355,5 +12355,5 @@
 msgstr "記述: {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
@@ -12364,5 +12364,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
@@ -12374,16 +12374,16 @@
 msgstr "説明"
 
-#: ../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 "時間間隔"
 
-#: ../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 "長さ"
 
-#: ../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
@@ -12392,6 +12392,6 @@
 msgstr "長さ: {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
@@ -12401,6 +12401,6 @@
 msgstr[0] "{0}ルート, "
 
-#: ../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
@@ -12410,11 +12410,11 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../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ポイント"
 
-#: ../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
@@ -12423,10 +12423,10 @@
 msgstr[0] "{0} トラック "
 
-#: ../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 "データレイヤーへ変換"
 
-#: ../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."
@@ -12437,10 +12437,10 @@
 "よ :</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
@@ -12451,7 +12451,7 @@
 msgstr "{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
@@ -12462,5 +12462,5 @@
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../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
@@ -12468,5 +12468,5 @@
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../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
@@ -12475,5 +12475,5 @@
 msgstr "{0} メータ"
 
-#: ../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
@@ -12481,5 +12481,5 @@
 msgstr "リクエストあたりの最大面積："
 
-#: ../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
@@ -12488,25 +12488,25 @@
 msgstr "{0} 平方キロメートル"
 
-#: ../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 "近隣をダウンロード:"
 
-#: ../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 "トラックのみ"
 
-#: ../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 "ウェイポイントのみ"
 
-#: ../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 "トラックおよびウェイポイント"
 
-#: ../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
@@ -12519,10 +12519,10 @@
 "すか？</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."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../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 ""
@@ -12533,5 +12533,5 @@
 "に変更又は移動されました。"
 
-#: ../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 ""
@@ -12542,35 +12542,15 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../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 "このレイヤーの点の間に線を引く。"
-
 #: ../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 "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../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
@@ -12578,10 +12558,10 @@
 msgstr "{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 "音声のインポート"
 
-#: ../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
@@ -12594,6 +12574,6 @@
 "タイムスタンプの情報が無いため、音声データとの同期はできません。</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
@@ -12601,10 +12581,10 @@
 msgstr "インポートできません"
 
-#: ../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 "WAV音声ファイル(*.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
@@ -12612,10 +12592,10 @@
 msgstr "{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 "イメージのインポート"
 
-#: ../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
@@ -13412,5 +13392,5 @@
 msgstr "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
@@ -13420,5 +13400,5 @@
 msgstr "警告： Mappaintスタイルを\"{0}\"から読み込めません。発生した例外は {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}''..."
@@ -14412,5 +14392,98 @@
 msgstr "色"
 
-#: ../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 "ウェイの向きを矢印で表示"
+
+#. 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 "ウェイの開始のみ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "一方通行の向きを矢印で表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "セグメントの順序番号を表示する"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "ダウンロードデータの境界を表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "選択モードで仮想ノードを表示する"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "アクティブなレイヤー以外は別の色で表示する"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "地図画像をスムース処理（アンチエイリアス）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "エリアのアウトラインだけを描く"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPSポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "ウェイのセグメントに方向のヒントを描く。"
+
+#. 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 ""
+
+#. 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 "ウェイ内の全セグメントで順序番号を表示する。"
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "サーバから読み出したデータの境界を描く。"
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
+
+#. 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 "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSMデータ"
+
+#: ../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 "全体設定を使用"
+
+#: ../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
@@ -14421,10 +14494,10 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../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
@@ -14433,30 +14506,35 @@
 msgstr "なし"
 
-#: ../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 "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../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 "大きなGPS点を表示"
 
-#: ../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 "HDOP（垂直精度劣化度）の値の円を描いてください"
 
-#: ../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 "速度（赤＝遅い、緑＝速い）"
 
-#: ../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 ""
 
-#: ../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 "位置精度低下率（赤=高い、緑=低い、可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -14464,5 +14542,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"
@@ -14486,5 +14564,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
@@ -14527,5 +14605,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
@@ -14539,61 +14617,22 @@
 msgstr "徒歩"
 
-#: ../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 "ウェイの向きを矢印で表示"
-
-#: ../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 "GPX読み込み時にマーカーを作成。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
-#. 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 "ウェイの開始のみ"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "一方通行の向きを矢印で表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "セグメントの順序番号を表示する"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "ダウンロードデータの境界を表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "選択モードで仮想ノードを表示する"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "アクティブなレイヤー以外は別の色で表示する"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "地図画像をスムース処理（アンチエイリアス）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "GPX読み込み時にマーカーを作成。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "エリアのアウトラインだけを描く"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "自動"
 
 #. 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"
@@ -14601,14 +14640,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 "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "両方"
 
-#: ../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 "
@@ -14618,9 +14658,11 @@
 "る。"
 
-#: ../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 "GPSトラックのポイント間の線"
 
-#: ../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 "
@@ -14628,35 +14670,35 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../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 "ローカルファイルに対する最大長 (メートル)"
 
-#: ../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."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../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 "最大長（ｍ）"
 
 #. 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."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../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 "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. 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 "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. 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 "
@@ -14664,13 +14706,14 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../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 "最小距離（ピクセル）"
 
-#: ../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 "GPSポイントに大きなドットを表示する"
 
-#: ../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 "
@@ -14680,13 +14723,13 @@
 "可能です。"
 
-#: ../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 "速度により点とトラックセグメントの色を決める。"
 
-#: ../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 ""
 
-#: ../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 "
@@ -14694,63 +14737,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../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 "トラックと点の配色"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "ウェイポイントラベル付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "ウェイのセグメントに方向のヒントを描く。"
-
-#. 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 ""
-
-#. 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 "ウェイ内の全セグメントで順序番号を表示する。"
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "サーバから読み出したデータの境界を描く。"
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
-
-#. 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 "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSMデータ"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16596,25 +16604,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "リレーション''{0}'' をダウンロード中"
+msgstr ""
 
 #: ../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 "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18352,5 +18360,6 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../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 ""
@@ -18361,11 +18370,11 @@
 "動作停止します。"
 
-#: ../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}"
 msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {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 ""
@@ -36279,9 +36288,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36380,5 +36389,5 @@
 msgstr ""
 
-#: ../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 "レイヤーのプロパティ"
@@ -37315,7 +37324,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "自動キャッシュを有効にする"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37414,7 +37422,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "クリックして現在の操作をキャンセル"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38107,4 +38114,20 @@
 "てください："
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38719,12 +38742,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "このボタンを隠します"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "このボタンを隠します"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38733,14 +38754,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "トラック グレード 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40338,5 +40355,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}"
@@ -40344,5 +40361,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 ""
@@ -42755,11 +42772,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"マージする二つ以上のノードを選択するか、マージ先の近くのノードを選択してくだ"
-"さい。"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44938,4 +44952,7 @@
 #~ msgid "Edit Track of grade 5"
 #~ msgstr "トラック グレード 5 の編集"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "トラック グレード 3"
 
 #~ msgid "Track Grade 5"
@@ -47304,4 +47321,7 @@
 #~ msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
 
+#~ msgid "Downloading relation ''{0}''"
+#~ msgstr "リレーション''{0}'' をダウンロード中"
+
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 26406)
+++ applications/editors/josm/i18n/po/nb.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 17:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:31+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:41+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
@@ -161,5 +161,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
@@ -395,5 +395,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
@@ -1202,5 +1202,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
@@ -1430,5 +1430,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"
@@ -2375,5 +2375,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
@@ -7814,5 +7814,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 ""
@@ -9286,5 +9286,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
@@ -12074,16 +12074,16 @@
 msgstr "Tilpass farge"
 
-#: ../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 "Standard"
 
-#: ../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 "Velg en farge"
 
-#: ../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
@@ -12093,6 +12093,6 @@
 msgstr "Navn: {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
@@ -12102,5 +12102,5 @@
 msgstr "Beskrivelse: {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
@@ -12112,5 +12112,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
@@ -12122,16 +12122,16 @@
 msgstr "Beskrivelse"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12140,6 +12140,6 @@
 msgstr ""
 
-#: ../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
@@ -12150,6 +12150,6 @@
 msgstr[1] "{0} ruter, "
 
-#: ../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
@@ -12160,11 +12160,11 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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
@@ -12174,10 +12174,10 @@
 msgstr[1] "{0} spor, "
 
-#: ../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 "Konverter til datalag"
 
-#: ../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."
@@ -12185,10 +12185,10 @@
 msgstr ""
 
-#: ../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
@@ -12199,7 +12199,7 @@
 msgstr "Konvertert fra: {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
@@ -12210,5 +12210,5 @@
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../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
@@ -12216,5 +12216,5 @@
 msgstr "Last ned alt innenfor:"
 
-#: ../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
@@ -12223,5 +12223,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
@@ -12229,5 +12229,5 @@
 msgstr "Max areal per forespørsel:"
 
-#: ../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
@@ -12236,25 +12236,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12267,10 +12267,10 @@
 "Ønsker du<br>å fortsette?</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."
 msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../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 ""
@@ -12281,5 +12281,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../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 ""
@@ -12290,35 +12290,15 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Tilpass linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Bruk globale innstillinger."
-
-#: ../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 "Tegn linjer mellem punkter i dette laget."
-
 #: ../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 "Tegn ikke linjer mellem punkt i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../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
@@ -12326,10 +12306,10 @@
 msgstr "Navngivne sporpunkt fra {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 "Importer lyd"
 
-#: ../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
@@ -12340,6 +12320,6 @@
 msgstr ""
 
-#: ../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
@@ -12347,10 +12327,10 @@
 msgstr ""
 
-#: ../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 "Wave-lydfiler (*.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
@@ -12358,10 +12338,10 @@
 msgstr "Lyd-markører fra {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 "Importer bilder"
 
-#: ../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
@@ -13153,5 +13133,5 @@
 msgstr "Feil ved visning av 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
@@ -13161,5 +13141,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14095,5 +14075,98 @@
 msgstr "Farger"
 
-#: ../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 "Tegn retningspiler."
+
+#. 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 "Bare ved enden av linja."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Tegn segment-nummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Tegn omfang af nedlastede data"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Tegn virtuelle noder i utvalg-tilstand"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Tegn inaktive lag i annen farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Glatting på kartgrafikk (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Tegn retningspiler på linjestykker."
+
+#. 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 ""
+
+#. 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 "Tegn nummer for linjesegmenter i hver linje."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Tegn omrisset av data hentet fra tjeneren."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
+
+#. 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 "Tegn inaktive datalag i en annen farge."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-data"
+
+#: ../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 "Bruk globale innstillinger."
+
+#: ../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
@@ -14104,10 +14177,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 filer"
 
-#: ../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
@@ -14116,30 +14189,35 @@
 msgstr "Ingen"
 
-#: ../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 "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../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 "Tegn store GPS-punkt."
 
-#: ../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 ""
 
-#: ../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 "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../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 ""
 
-#: ../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 "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -14147,5 +14225,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"
@@ -14169,5 +14247,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
@@ -14210,5 +14288,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
@@ -14222,61 +14300,22 @@
 msgstr "Til fots"
 
-#: ../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 "Tegn retningspiler."
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
-#. 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 "Bare ved enden av linja."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Tegn segment-nummer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Tegn omfang af nedlastede data"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Tegn virtuelle noder i utvalg-tilstand"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Tegn inaktive lag i annen farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Glatting på kartgrafikk (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automatisk"
 
 #. 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"
@@ -14284,14 +14323,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 "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Begge"
 
-#: ../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 "
@@ -14299,9 +14339,11 @@
 msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
 
-#: ../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 "Tegn linjer mellom GPS-punkt"
 
-#: ../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 "
@@ -14311,9 +14353,10 @@
 "linjer."
 
-#: ../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 "Max lengde for lokale filer (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."
@@ -14322,10 +14365,10 @@
 "alle linjer."
 
-#: ../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 "Maksimal lengde (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."
@@ -14333,11 +14376,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../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 "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. 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 ""
@@ -14345,5 +14387,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 "
@@ -14351,13 +14393,14 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../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 "Minste avstand (pixels)"
 
-#: ../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 "Tegn større prikker for GPS-punkter."
 
-#: ../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 "
@@ -14367,13 +14410,13 @@
 "for Lag."
 
-#: ../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 "Punkt og track linjer får farge etter hastighet."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14381,63 +14424,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "Tillater å justere fargen etter gjennomsnittsfarten."
 
-#: ../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 "Farge på punkt og track linjer"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Tegn retningspiler på linjestykker."
-
-#. 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 ""
-
-#. 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 "Tegn nummer for linjesegmenter i hver linje."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Tegn omrisset av data hentet fra tjeneren."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
-
-#. 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 "Tegn inaktive datalag i en annen farge."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16222,24 +16230,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Last ned  WMS kartutsnitt fra {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17872,5 +17880,6 @@
 msgstr "Fant ikke oversettelsen for {0}. Bruker {1}."
 
-#: ../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 ""
@@ -17879,11 +17888,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35765,9 +35774,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35866,5 +35875,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36794,7 +36803,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Aktiviser automatisk mellomlager."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37563,4 +37571,20 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Tilpass linjetegning"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter i dette laget."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkt i dette laget."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Velg linjetegnings-innstillinger"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38175,7 +38199,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Skjul"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38188,14 +38211,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/t"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Traktorvei klasse 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39793,5 +39812,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}"
@@ -39799,5 +39818,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 ""
@@ -42199,9 +42218,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Velg minst to noder til å samle"
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -42755,4 +42773,7 @@
 #~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF="
 #~ "\"{1}\">norsk bokmål</A>."
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Velg minst to noder til å samle"
 
 #~ msgid ""
@@ -43755,4 +43776,7 @@
 #~ msgid "Add a new layer"
 #~ msgstr "Legg til nytt lag"
+
+#~ msgid "Download WMS tile from {0}"
+#~ msgstr "Last ned  WMS kartutsnitt fra {0}"
 
 #~ msgid "Adjust the position of the WMS layer"
@@ -44137,4 +44161,7 @@
 #~ msgid "Footway"
 #~ msgstr "Gangvei"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Traktorvei klasse 3"
 
 #~ msgid "Track Grade 1"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 26406)
+++ applications/editors/josm/i18n/po/nl.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 11:14+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:37+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:46+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
@@ -165,5 +165,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
@@ -405,5 +405,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
@@ -1227,5 +1227,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
@@ -1478,5 +1478,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"
@@ -2486,5 +2486,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
@@ -8184,5 +8184,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 "Terugzetten van stijlbronnen uit bestand"
@@ -9683,5 +9683,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
@@ -12635,16 +12635,16 @@
 msgstr "Kleur aanpassen"
 
-#: ../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 "Standaard"
 
-#: ../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 "Kies een kleur"
 
-#: ../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
@@ -12654,6 +12654,6 @@
 msgstr "Naam: {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
@@ -12663,5 +12663,5 @@
 msgstr "Beschrijving: {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
@@ -12673,5 +12673,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
@@ -12683,16 +12683,16 @@
 msgstr "Beschrijving"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12701,6 +12701,6 @@
 msgstr ""
 
-#: ../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
@@ -12711,6 +12711,6 @@
 msgstr[1] "{0} routes, "
 
-#: ../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
@@ -12721,11 +12721,11 @@
 msgstr[1] "{0} waypoints"
 
-#: ../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-punt"
 
-#: ../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
@@ -12735,10 +12735,10 @@
 msgstr[1] "{0} tracks, "
 
-#: ../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 "Naar gegevenslaag omzetten"
 
-#: ../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."
@@ -12749,10 +12749,10 @@
 "</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
@@ -12763,7 +12763,7 @@
 msgstr "Omgezet van: {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
@@ -12774,5 +12774,5 @@
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../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
@@ -12780,5 +12780,5 @@
 msgstr "Alles downloaden binnen:"
 
-#: ../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
@@ -12787,5 +12787,5 @@
 msgstr "{0} meters"
 
-#: ../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
@@ -12793,5 +12793,5 @@
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../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
@@ -12800,25 +12800,25 @@
 msgstr "{0} km2"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12831,10 +12831,10 @@
 "verder<br>gaan?</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."
 msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../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 ""
@@ -12845,5 +12845,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../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 ""
@@ -12854,35 +12854,15 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Lijntekening aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Algemene instellingen gebruiken."
-
-#: ../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 "Lijnen tussen punten in deze laag tekenen."
-
 #: ../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 "Geen lijnen tussen punten in deze laag tekenen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Lijntekenopties selecteren"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../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
@@ -12890,10 +12870,10 @@
 msgstr "Benoemde trackpunten van {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 "Geluid importeren"
 
-#: ../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
@@ -12904,6 +12884,6 @@
 msgstr ""
 
-#: ../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
@@ -12911,10 +12891,10 @@
 msgstr ""
 
-#: ../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 "Wave-geluidsbestanden (*.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
@@ -12922,10 +12902,10 @@
 msgstr "Geluidsmarkers van {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 "Afbeeldingen importeren"
 
-#: ../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
@@ -13727,5 +13707,5 @@
 msgstr "Fouten tijden tonen 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
@@ -13735,5 +13715,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14671,5 +14651,101 @@
 msgstr "Kleuren"
 
-#: ../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 "Teken richting pijlen."
+
+#. 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 "Alleen op de kop van een weg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Nummers segmentvolgorde tekenen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Grenzen gedownload gebied tekenen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Virtuele knopen in selectiemodus tekenen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Inactieve lagen in andere kleur tekenen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Richtingwijzers voor wegsegmenten tekenen."
+
+#. 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 ""
+
+#. 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 "De volgordenummers van alle segmenten binnen hun weg tekenen."
+
+#. 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 op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
+"gevolg."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Virtuele knopen in geselecteerde modus tekenen voor eenvoudigere bewerking."
+
+#. 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 "De inactieve gegevenslagen in een andere kleur tekenen."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-gegevens"
+
+#: ../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 "Algemene instellingen gebruiken."
+
+#: ../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
@@ -14680,10 +14756,10 @@
 msgstr "Alles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14692,30 +14768,35 @@
 msgstr "Geen"
 
-#: ../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 "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
 
-#: ../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 "Grote GPS-punten tekenen"
 
-#: ../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 ""
 
-#: ../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 "Snelheid (rood = langzaam, groen = snel)"
 
-#: ../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 ""
 
-#: ../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 "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -14723,5 +14804,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"
@@ -14745,5 +14826,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
@@ -14786,5 +14867,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
@@ -14798,61 +14879,22 @@
 msgstr "Te voet"
 
-#: ../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 "Teken richting pijlen."
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
-#. 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 "Alleen op de kop van een weg."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Nummers segmentvolgorde tekenen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Grenzen gedownload gebied tekenen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Virtuele knopen in selectiemodus tekenen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Inactieve lagen in andere kleur tekenen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14860,14 +14902,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14877,9 +14920,11 @@
 "een GPX-laag."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14887,9 +14932,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
@@ -14898,10 +14944,10 @@
 "tekenen."
 
-#: ../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 "Maximum lengte (meters)"
 
 #. 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."
@@ -14910,11 +14956,10 @@
 "bevatten."
 
-#: ../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 "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. 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 ""
@@ -14923,5 +14968,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 "
@@ -14930,13 +14975,14 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../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 "Minimum afstand (pixels)"
 
-#: ../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 "De GPS-punten groter tekenen."
 
-#: ../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 "
@@ -14946,13 +14992,13 @@
 "ingesteld in Laagbeheer."
 
-#: ../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 "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14960,67 +15006,29 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../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 "Track- en puntkleuring"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Richtingwijzers voor wegsegmenten tekenen."
-
-#. 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 ""
-
-#. 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 "De volgordenummers van alle segmenten binnen hun weg tekenen."
-
-#. 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 op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
-"gevolg."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Virtuele knopen in geselecteerde modus tekenen voor eenvoudigere bewerking."
-
-#. 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 "De inactieve gegevenslagen in een andere kleur tekenen."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-gegevens"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16821,24 +16829,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Geselecteerde relaties afhalen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18489,5 +18497,6 @@
 msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
 
-#: ../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 ""
@@ -18496,11 +18505,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -36355,9 +36364,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36456,5 +36465,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37379,7 +37388,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Automatisch bufferen inschakelen"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37477,7 +37485,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klik om de huidige operatie te annuleren."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38149,4 +38156,20 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Lijntekening aanpassen"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Lijnen tussen punten in deze laag tekenen."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Geen lijnen tussen punten in deze laag tekenen."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Lijntekenopties selecteren"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38761,12 +38784,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Verberg deze knop"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Verberg deze knop"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38775,14 +38796,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Track (klasse 1)"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40379,5 +40396,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}"
@@ -40385,5 +40402,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 ""
@@ -42779,11 +42796,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Selecteer ten minste twee knooppunten om samen te voegen of een knooppunt "
-"dat dicht bij een andere ligt."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44845,4 +44859,7 @@
 #~ msgstr "Syncroniseer tijd met GPS-apparaat"
 
+#~ msgid "Track Grade 1"
+#~ msgstr "Track (klasse 1)"
+
 #~ msgid "Track Grade 2"
 #~ msgstr "Track (klasse 2)"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 26406)
+++ applications/editors/josm/i18n/po/pl.po	(revision 26428)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
-"PO-Revision-Date: 2011-07-26 08:36+0000\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"PO-Revision-Date: 2011-07-28 10:43+0000\n"
 "Last-Translator: Rafał <rrudzik@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -18,6 +18,6 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:11+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:47+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
@@ -81,5 +81,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
@@ -168,5 +168,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
@@ -331,4 +331,7 @@
 "page for OSM object will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"UWAGA: nieznany format adresu URL API. Przekierowanie do strony z informacją "
+"lub historią OSM prawdopodobnie zakończy się niepowodzeniem. Adres URL API "
+"to: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -404,5 +407,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
@@ -973,5 +976,5 @@
 msgctxt "osm object types"
 msgid "mixed"
-msgstr ""
+msgstr "różne"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
@@ -1076,6 +1079,7 @@
 msgid "One downloaded object is deleted."
 msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pobrany obiekt został usunięty."
+msgstr[1] "{0} pobrane obiekty zostały usunięte."
+msgstr[2] "{0} pobranych obiektów zostało usuniętych."
 
 #. content.add(scroller);
@@ -1221,5 +1225,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
@@ -1454,5 +1458,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"
@@ -1522,5 +1526,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Niepoprawny URL WMS lub id"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
@@ -2425,5 +2429,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
@@ -4681,5 +4685,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java:192
 msgid "Unordered coastline"
-msgstr ""
+msgstr "Nieuporządkowana linia brzegowa"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java:196
@@ -4713,5 +4717,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "Ten test sprawdza czy nie ma węzłów które mają tą samą pozycję."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:196
@@ -4779,5 +4783,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
 msgid "Duplicated relations."
-msgstr ""
+msgstr "Powielone relacje"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:139
@@ -4786,20 +4790,22 @@
 "with same roles."
 msgstr ""
+"Ten test sprawdza czy nie istnieją relacje z takimi samymi tagami i "
+"posiadające tych samych członków z identycznymi rolami."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:159
 msgid "Duplicated relations"
-msgstr ""
+msgstr "Powielone relacje"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:168
 msgid "Relations with same members"
-msgstr ""
+msgstr "Relacje z tymi samymi członakmi"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:251
 msgid "Delete duplicate relations"
-msgstr ""
+msgstr "Usuń powielone relacje"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:88
 msgid "Duplicated ways."
-msgstr ""
+msgstr "Powielone drogi"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:89
@@ -4808,4 +4814,6 @@
 "optionally also same tags."
 msgstr ""
+"Ten test sprawdza czy nie istnieją drogi z tymi samymi węzłami i opcjonalnie "
+"z tymi samymi tagami."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:105
@@ -4815,5 +4823,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:130
 msgid "Ways with same position"
-msgstr ""
+msgstr "Drogi z tą samą pozycją"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:225
@@ -4837,9 +4845,9 @@
 #: build/trans_presets.java:4096
 msgid "Multipolygon"
-msgstr ""
+msgstr "Multipolygon"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
 msgid "This test checks if multipolygons are valid"
-msgstr ""
+msgstr "Ten test sprawdza czy multipolygony są poprawne"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
@@ -4853,9 +4861,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
 msgid "No style for multipolygon"
-msgstr ""
+msgstr "Brak stylu dla multipolygonu"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style in multipolygon relation"
-msgstr ""
+msgstr "Brak stylu dla relacji multipolygonu"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
@@ -7912,5 +7920,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 ""
@@ -9397,5 +9405,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
@@ -10317,8 +10325,12 @@
 msgid "Add all objects selected in the current dataset before the first member"
 msgstr ""
+"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
+"pierwszego członka"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:764
 msgid "Add all objects selected in the current dataset after the last member"
 msgstr ""
+"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
+"członku"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:791
@@ -10327,4 +10339,6 @@
 "member"
 msgstr ""
+"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
+"pierwszego zaznaczonego członka"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:825
@@ -10333,4 +10347,6 @@
 "member"
 msgstr ""
+"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
+"zaznaczonym członku"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
@@ -10347,4 +10363,5 @@
 msgid "Select relation members which refer to objects in the current selection"
 msgstr ""
+"Zaznacz członków relacji którzy odpowiadają obiektom obecnie zaznaczonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
@@ -10353,8 +10370,9 @@
 "Select relation members which refer to {0} objects in the current selection"
 msgstr ""
+"Zaznacz członków relacji którzy odpowiadają {0} obiektom obecnie zaznaczonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Select objects for selected relation members"
-msgstr ""
+msgstr "Zaznacz obiekty dla zaznaczonych członków relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
@@ -10427,5 +10445,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:596
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Tak, utwórz konflikt i zamknij"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1160
@@ -10436,5 +10454,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:602
 msgid "No, continue editing"
-msgstr ""
+msgstr "Nie, kontynuuj edycję"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
@@ -11020,5 +11038,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:485
 msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Idź do strony domowej pomocy JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:516
@@ -11050,15 +11068,15 @@
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "Historia węzła {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Historia drogi {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
 #, java-format
 msgid "History for relation {0}"
-msgstr ""
+msgstr "Historia relacji {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
@@ -11097,20 +11115,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
-msgstr ""
+msgstr "Wczytywanie historii"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Wczytywanie historii węzła {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Wczytywanie historii drogi {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr ""
+msgstr "Wczytywanie historii relacji {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -11118,27 +11136,27 @@
 #, java-format
 msgid "Node {0}"
-msgstr ""
+msgstr "Węzeł {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Powiększ do węzła"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
 msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Powiększ do tego węzła w bieżącym zestawie danych"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr ""
+msgstr "Otwórz przeglądarkę historii z historią tego węzła"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
 #, java-format
 msgid "Way {0}"
-msgstr ""
+msgstr "Droga {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
 #, java-format
 msgid "Relation {0}"
-msgstr ""
+msgstr "Relacja {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
@@ -11153,5 +11171,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "Changeset"
-msgstr ""
+msgstr "Zestaw zmian"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11159,5 +11177,5 @@
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
-msgstr ""
+msgstr "<html>Wersja <strong>{0}</strong> edytowana na warstwie ''{1}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:95
@@ -11166,4 +11184,5 @@
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
+"<html>Wersja <strong>{0}</strong> stworzone na <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -11173,25 +11192,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Uruchom przeglądarkę z informacją o zestawie zmian"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Pokaż zestaw zmian {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:58
 #, java-format
 msgid "Version {0}, {1} (by {2})"
-msgstr ""
+msgstr "Wersja {0}, {1} ({2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:74
 #, java-format
 msgid "Version {0} created on {1} by {2}"
-msgstr ""
+msgstr "Wersja {0} stworzona na {1} przez {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:102
 #, java-format
 msgid "Version {0} in editor"
-msgstr ""
+msgstr "Wersja {0} w edytorze"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:104
@@ -11202,9 +11221,9 @@
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr ""
+msgstr "Wersja {0} edytowana w warstwie danych \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
 msgid "Version"
-msgstr ""
+msgstr "Wersja"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:59
@@ -12238,16 +12257,16 @@
 msgstr "Dostosuj kolor"
 
-#: ../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 "Domyślny"
 
-#: ../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 "Wybierz kolor"
 
-#: ../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
@@ -12257,6 +12276,6 @@
 msgstr "Nazwa: {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
@@ -12266,5 +12285,5 @@
 msgstr "Opis: {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
@@ -12277,5 +12296,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
@@ -12287,16 +12306,16 @@
 msgstr "Opis"
 
-#: ../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 "Zakres czasu"
 
-#: ../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 "Długość"
 
-#: ../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
@@ -12305,6 +12324,6 @@
 msgstr "Długość: {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
@@ -12316,6 +12335,6 @@
 msgstr[2] "{0} tras, "
 
-#: ../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
@@ -12327,11 +12346,11 @@
 msgstr[2] "{0} punktów"
 
-#: ../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 "punkt GPS"
 
-#: ../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
@@ -12342,10 +12361,10 @@
 msgstr[2] "{0} śladów, "
 
-#: ../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 "Przekształć w warstwę danych"
 
-#: ../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."
@@ -12353,10 +12372,10 @@
 msgstr ""
 
-#: ../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
@@ -12367,7 +12386,7 @@
 msgstr "Przekonwertowany z: {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
@@ -12378,5 +12397,5 @@
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../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
@@ -12384,5 +12403,5 @@
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../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
@@ -12391,5 +12410,5 @@
 msgstr "{0} metrów"
 
-#: ../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
@@ -12397,5 +12416,5 @@
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../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
@@ -12404,25 +12423,25 @@
 msgstr "{0} km kw."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "tylko punkty"
 
-#: ../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 "ścieżka i punkty"
 
-#: ../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
@@ -12435,5 +12454,5 @@
 "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."
@@ -12442,5 +12461,5 @@
 "danymi dźwiękowymi."
 
-#: ../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 ""
@@ -12449,5 +12468,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12456,35 +12475,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Dostosuj rysowanie linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Użyj ustawień globalnych."
-
-#: ../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 "Rysuj linie pomiędzy punktami na tej warstwie."
-
 #: ../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 "Nie rysuj linii pomiędzy punktami na tej warstwie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../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
@@ -12492,10 +12491,10 @@
 msgstr "Nazwane punkty GPS z {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 "Importuj dźwięk"
 
-#: ../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
@@ -12509,6 +12508,6 @@
 "nimi dźwięku.</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
@@ -12516,10 +12515,10 @@
 msgstr "Import nie jest możliwy"
 
-#: ../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 "Pliki audio Wave (*.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
@@ -12527,10 +12526,10 @@
 msgstr "Markery audio z {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 "Importuj obrazki"
 
-#: ../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
@@ -13316,5 +13315,5 @@
 msgstr "Błąd podczas wyświetlania adresu"
 
-#: ../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
@@ -13326,5 +13325,5 @@
 "{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}''..."
@@ -14255,5 +14254,100 @@
 msgstr "Kolory"
 
-#: ../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 "Rysuj strzałki kierunkowe"
+
+#. 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 "Tylko na początku drogi."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Rysuj strzałki dla ulic jednokierunkowych"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Numeruj kolejne segmenty dróg."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Rysuj granicę obszaru pobranych danych"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Rysuj tylko kontury obszarów"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Punkty GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Rysuje strzałki kierunkowe dla segmentów drogi."
+
+#. 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 ""
+
+#. 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 "Rysuje kolejne numery wszystkich segmentów drogi."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Stosuje antialiasing dla widoku mapy dając gładszy wygląd."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Rysuje granice obszaru danych pobranych z serwera."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Rysuje węzły wirtualne podczas pracy w trybie zaznaczania dla łatwej "
+"modyfikacji dróg."
+
+#. 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 "Zaznacza nieaktywne warstwy danych innym kolorem."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Dane OSM"
+
+#: ../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 "Użyj ustawień globalnych."
+
+#: ../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
@@ -14264,10 +14358,10 @@
 msgstr "wszystkie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "pliki lokalne"
 
-#: ../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
@@ -14276,30 +14370,35 @@
 msgstr "żadne"
 
-#: ../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 "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków."
 
-#: ../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 "Rysuj duże punkty GPS."
 
-#: ../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 "Rysuj okręgi na podstawie wartości HDOP."
 
-#: ../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 "Prędkość (czerwony = wolno, zielony = szybko)"
 
-#: ../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 ""
 
-#: ../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 "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jeden kolor (moze być zmieniony dla nazwanej warstwy)"
@@ -14307,5 +14406,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"
@@ -14329,5 +14428,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
@@ -14370,5 +14469,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
@@ -14382,61 +14481,22 @@
 msgstr "Ruch pieszy"
 
-#: ../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 "Rysuj strzałki kierunkowe"
-
-#: ../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 "Twórz znaczniki podczas czytania GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
-#. 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 "Tylko na początku drogi."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Rysuj strzałki dla ulic jednokierunkowych"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Numeruj kolejne segmenty dróg."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Rysuj granicę obszaru pobranych danych"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Twórz znaczniki podczas czytania GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Rysuj tylko kontury obszarów"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automatycznie"
 
 #. 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"
@@ -14444,14 +14504,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 "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Obie"
 
-#: ../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 "
@@ -14461,9 +14522,11 @@
 "otwierania warstwy GPX."
 
-#: ../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 "Rysuj linie pomiędzy punktami GPS"
 
-#: ../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 "
@@ -14473,9 +14536,10 @@
 "rysować linie."
 
-#: ../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 "Maksymalna długość dla plików lokalnych (w metrach)"
 
-#: ../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."
@@ -14484,10 +14548,10 @@
 "rysować linie."
 
-#: ../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 "Maksymalna długość (w metrach)"
 
 #. 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."
@@ -14496,11 +14560,10 @@
 "liniach."
 
-#: ../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 "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. 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 ""
@@ -14509,5 +14572,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 "
@@ -14515,13 +14578,14 @@
 msgstr ""
 
-#: ../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 "Minimalna odległość (w pikselach)"
 
-#: ../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 "Rysuj większe kropki dla punktów GPS."
 
-#: ../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 "
@@ -14529,13 +14593,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14543,66 +14607,29 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../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 "Kolorowanie ścieżek i punktów"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Etykietowanie punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Punkty GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Rysuje strzałki kierunkowe dla segmentów drogi."
-
-#. 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 ""
-
-#. 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 "Rysuje kolejne numery wszystkich segmentów drogi."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Stosuje antialiasing dla widoku mapy dając gładszy wygląd."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Rysuje granice obszaru danych pobranych z serwera."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Rysuje węzły wirtualne podczas pracy w trybie zaznaczania dla łatwej "
-"modyfikacji dróg."
-
-#. 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 "Zaznacza nieaktywne warstwy danych innym kolorem."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Dane OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16408,24 +16435,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Wysyłanie do \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18087,5 +18114,6 @@
 "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}."
 
-#: ../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 ""
@@ -18094,11 +18122,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35955,9 +35983,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36056,5 +36084,5 @@
 msgstr "Zaznacza wszystkie adresy z niekompletnymi danymi."
 
-#: ../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 ""
@@ -37063,7 +37091,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Kliknij aby przerwać trwającą operację"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37726,4 +37753,20 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Dostosuj rysowanie linii"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Wybierz opcje rysowania linii"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38338,7 +38381,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Ukryj elementy"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38351,14 +38393,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "droga gruntowa klasy 1"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39942,5 +39980,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}"
@@ -39948,5 +39986,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 ""
@@ -42345,9 +42383,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43179,4 +43216,7 @@
 #~ msgid "Footway"
 #~ msgstr "droga dla pieszych"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "droga gruntowa klasy 1"
 
 #~ msgid "Track Grade 2"
@@ -43662,4 +43702,7 @@
 #~ msgid "None of this way's nodes are glued to anything else."
 #~ msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej."
+
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 26406)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 26428)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 16:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -18,6 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:36+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:45+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -78,5 +78,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
@@ -166,5 +166,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
@@ -407,5 +407,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
@@ -1218,5 +1218,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
@@ -1461,5 +1461,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"
@@ -2458,5 +2458,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
@@ -8099,5 +8099,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 "Recarregando as fontes de estilos"
@@ -9591,5 +9591,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
@@ -12591,16 +12591,16 @@
 msgstr "Personalizar cores"
 
-#: ../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 "Padrão"
 
-#: ../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 "Selecionar uma cor"
 
-#: ../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
@@ -12610,6 +12610,6 @@
 msgstr "Nome: {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
@@ -12619,5 +12619,5 @@
 msgstr "Descrição: {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
@@ -12629,5 +12629,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
@@ -12639,16 +12639,16 @@
 msgstr "Descrição"
 
-#: ../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 "Vigência"
 
-#: ../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 "Comprimento"
 
-#: ../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
@@ -12657,6 +12657,6 @@
 msgstr "Comprimento: {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
@@ -12667,6 +12667,6 @@
 msgstr[1] "{0} rotas, "
 
-#: ../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
@@ -12677,11 +12677,11 @@
 msgstr[1] "{0} pontos da via"
 
-#: ../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 "ponto GPS"
 
-#: ../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
@@ -12691,10 +12691,10 @@
 msgstr[1] "{0} trilhas, "
 
-#: ../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 "Converter para camada de dados"
 
-#: ../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."
@@ -12705,10 +12705,10 @@
 "aqui:</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 (EN)"
 
-#: ../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
@@ -12719,7 +12719,7 @@
 msgstr "Convertido de: {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
@@ -12730,5 +12730,5 @@
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../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
@@ -12736,5 +12736,5 @@
 msgstr "Descargar tudo entre:"
 
-#: ../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
@@ -12743,5 +12743,5 @@
 msgstr "{0} metros"
 
-#: ../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
@@ -12749,5 +12749,5 @@
 msgstr "Área máxima por pedio:"
 
-#: ../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
@@ -12756,25 +12756,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 "Baixar próximo:"
 
-#: ../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 "somente trilha"
 
-#: ../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 "somente pontos"
 
-#: ../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 "trilhas e pontos"
 
-#: ../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
@@ -12787,10 +12787,10 @@
 "Você deseja </br> continuar? </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."
 msgstr "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../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 ""
@@ -12801,5 +12801,5 @@
 "posterior ao final, foram omitidos ou movidos para o começo."
 
-#: ../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 ""
@@ -12809,35 +12809,15 @@
 "Alguns pontos de interesse que ficaram muito longe da trilha foram omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Personalizar linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Usar preferências globais."
-
-#: ../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 "Desenhar linhas entre pontos para esta camada."
-
 #: ../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 "Não desenhar linhas entre pontos para esta camada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Selecionar opções de linha"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../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
@@ -12845,10 +12825,10 @@
 msgstr "Trackpoints nomeados de {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 "Importar Áudio"
 
-#: ../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
@@ -12862,6 +12842,6 @@
 "correlacionar os pontos com os dados de audio.</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
@@ -12869,10 +12849,10 @@
 msgstr "Importação não possível"
 
-#: ../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 "Árquivos de Áudio WAV (*.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
@@ -12880,10 +12860,10 @@
 msgstr "Marcadores de áudio de {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 "Importar imagens"
 
-#: ../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
@@ -13693,5 +13673,5 @@
 msgstr "Erro exibindo a 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
@@ -13701,5 +13681,5 @@
 msgstr "Aviso: falha ao ler estilos Mappaint de ''{0}''. A exceção foi: {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}''..."
@@ -14734,5 +14714,103 @@
 msgstr "Cores"
 
-#: ../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 "Desenhar setas de direção"
+
+#. 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 "Somente no sentido da via."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Desenhar número de sequência dos segmentos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Desenhar os limites dos dados recebidos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Desenhar nós virtuais no modo escollhido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Desenhar camadas inativas em cor diferente"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Gráficos do mapa suavizados (anti-alias)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Desenhar somente linhas de fora da área"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Pontos GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Desenhar sugestões de direção para os segmentos de trilha."
+
+#. 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 ""
+
+#. 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 ""
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Aplicar suavização para a visão do mapa, resultando em uma aparência mais "
+"suave."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Desenhar os limites dos dados carregados do servidor."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Desenhar nós virtuais no modo selecionado para modificação fácil de via."
+
+#. 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 "Desenhar as camadas de dados inativas em uma cor diferente."
+
+#: ../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 ""
+"Esta opção suprime o recheio da áreas, tapando tudo que foi especificado no "
+"estilo selecionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Dados OSM"
+
+#: ../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 "Usar preferências globais."
+
+#: ../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
@@ -14743,10 +14821,10 @@
 msgstr "Tudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../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
@@ -14755,30 +14833,35 @@
 msgstr "Nenhum"
 
-#: ../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 "Forçar linhas se nenhum segmento for importado."
 
-#: ../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 "Desenhe pontos GPS grandes."
 
-#: ../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 "Desenha um círculo com valor HDOP."
 
-#: ../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 "Velocidade (vermelho = lento, verde = rápido)"
 
-#: ../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 ""
 
-#: ../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 "Diluição da posição (vermelho = alta, verde = baixo, se disponível)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -14786,5 +14869,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"
@@ -14808,5 +14891,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
@@ -14849,5 +14932,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
@@ -14861,61 +14944,22 @@
 msgstr "A Pé"
 
-#: ../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 "Desenhar setas de direção"
-
-#: ../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 "Criar marcadores quando ler um arquivo GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Desenhar rápido (vai parecer feio)"
 
-#. 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 "Somente no sentido da via."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Desenhar número de sequência dos segmentos"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Desenhar os limites dos dados recebidos"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Desenhar nós virtuais no modo escollhido"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Desenhar camadas inativas em cor diferente"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Gráficos do mapa suavizados (anti-alias)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Criar marcadores quando ler um arquivo GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Desenhar somente linhas de fora da área"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Auto"
 
 #. 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"
@@ -14923,14 +14967,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 "Descrição"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Ambos"
 
-#: ../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 "
@@ -14940,9 +14985,11 @@
 "abrir um camada GPX."
 
-#: ../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 "Desenhar linhas entre os pontos GPS brutos"
 
-#: ../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 "
@@ -14952,9 +14999,10 @@
 "\"-1\" para desenhar todas as linhas."
 
-#: ../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 "Tamanho máximo para arquivos locais (em metros)"
 
-#: ../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."
@@ -14963,10 +15011,10 @@
 "todas as linhas."
 
-#: ../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 "Tamanho máximo (em metros)"
 
 #. 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."
@@ -14975,11 +15023,10 @@
 "informações de linha."
 
-#: ../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 "Desenha setas de direção para linhas, conectando pontos GPS."
 
 #. 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 ""
@@ -14988,5 +15035,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 "
@@ -14995,13 +15042,14 @@
 "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
-#: ../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 "Distância mínima (pixels)"
 
-#: ../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 "Desenha pontos grandes para os pontos GPS."
 
-#: ../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 "
@@ -15011,13 +15059,13 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../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 "Pontos coloridos e segmentos de trilha por velocidade."
 
-#: ../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 ""
 
-#: ../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 "
@@ -15027,68 +15075,28 @@
 "equipamento de captura precisa registrar essas informações."
 
-#: ../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 ""
+
+#. 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 "Permita ajustar a cor da trilha para diferentes médias de velocidade."
 
-#: ../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 "Coloração de trilhas e pontos"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Rótulo dos pontos da via"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Pontos GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Desenhar sugestões de direção para os segmentos de trilha."
-
-#. 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 ""
-
-#. 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 ""
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Aplicar suavização para a visão do mapa, resultando em uma aparência mais "
-"suave."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Desenhar os limites dos dados carregados do servidor."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Desenhar nós virtuais no modo selecionado para modificação fácil de via."
-
-#. 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 "Desenhar as camadas de dados inativas em uma cor diferente."
-
-#: ../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 ""
-"Esta opção suprime o recheio da áreas, tapando tudo que foi especificado no "
-"estilo selecionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Dados OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16979,26 +16987,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Baixando {0} objeto de \"{1}\""
+msgstr ""
 
 #: ../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 ""
-"Aviso: falha ao ler a Mensagem do Dia (MOTD) do ''{0}''. A exceção foi: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18674,5 +18681,6 @@
 "{1}."
 
-#: ../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 ""
@@ -18681,11 +18689,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {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 ""
@@ -36564,9 +36572,9 @@
 msgstr "Mostrar dados incompletos"
 
-#: ../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 "itens"
 
-#: ../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 "sem itens"
@@ -36667,5 +36675,5 @@
 msgstr "Selecionar todos os endereços com dados incompletos."
 
-#: ../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 "Propriedades da camada"
@@ -37598,7 +37606,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Habilitar cache automático"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37694,7 +37701,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Clique para cancelar a operação atual"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38367,4 +38373,20 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Personalizar linha"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Desenhar linhas entre pontos para esta camada."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Não desenhar linhas entre pontos para esta camada."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Selecionar opções de linha"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38979,12 +39001,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Esconder este botão"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Esconder este botão"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38993,14 +39013,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Nome do Marcador: "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40588,5 +40604,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}"
@@ -40594,5 +40610,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 ""
@@ -43020,11 +43036,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Por favor selecione ao menos dois nós para mesclar ou um nó que esteja "
-"próximo de outro nó."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 26406)
+++ applications/editors/josm/i18n/po/ru.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-26 18:31+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin@gmail.com>\n"
@@ -18,6 +18,6 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:32+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:42+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -80,5 +80,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
@@ -168,5 +168,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
@@ -408,5 +408,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
@@ -1230,5 +1230,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
@@ -1477,5 +1477,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"
@@ -2484,5 +2484,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
@@ -8197,5 +8197,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 "Перезагрузка источников стилей"
@@ -9689,5 +9689,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
@@ -12768,16 +12768,16 @@
 msgstr "Выбрать цвет"
 
-#: ../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 "По умолчанию"
 
-#: ../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 "Выбор цвета"
 
-#: ../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
@@ -12787,6 +12787,6 @@
 msgstr "Название: {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
@@ -12796,5 +12796,5 @@
 msgstr "Описание: {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
@@ -12807,5 +12807,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
@@ -12817,16 +12817,16 @@
 msgstr "Описание"
 
-#: ../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 "Период"
 
-#: ../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 "Длина"
 
-#: ../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
@@ -12835,6 +12835,6 @@
 msgstr "Длина: {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
@@ -12846,6 +12846,6 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../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
@@ -12857,11 +12857,11 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../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"
 
-#: ../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
@@ -12872,10 +12872,10 @@
 msgstr[2] "{0} дорожек, "
 
-#: ../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 "Преобразовать в слой данных"
 
-#: ../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."
@@ -12886,10 +12886,10 @@
 "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
@@ -12900,7 +12900,7 @@
 msgstr "Преобразовано из: {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
@@ -12911,5 +12911,5 @@
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../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
@@ -12917,5 +12917,5 @@
 msgstr "Скачать всё в пределах:"
 
-#: ../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
@@ -12924,5 +12924,5 @@
 msgstr "{0} метров"
 
-#: ../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
@@ -12930,5 +12930,5 @@
 msgstr "Максимальная область для одного запроса:"
 
-#: ../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
@@ -12937,25 +12937,25 @@
 msgstr "{0} кв. км."
 
-#: ../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 "Загрузить возле:"
 
-#: ../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 "только трек"
 
-#: ../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 "только дорожные точки"
 
-#: ../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 "треки и дорожные точки"
 
-#: ../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
@@ -12968,10 +12968,10 @@
 "Продолжить?</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."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../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 ""
@@ -12982,5 +12982,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../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 ""
@@ -12991,35 +12991,15 @@
 "проигнорированы при расчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Настроить отрисовку линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Использовать глобальные настройки."
-
-#: ../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 "Отображать линии между точками для этого слоя."
-
 #: ../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 "Не отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Маркеры из именованых точек"
 
-#: ../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
@@ -13027,10 +13007,10 @@
 msgstr "Именованные точки трека из {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 "Импортировать аудиофайлы"
 
-#: ../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
@@ -13044,6 +13024,6 @@
 "аудиоданными.</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
@@ -13051,10 +13031,10 @@
 msgstr "Импорт невозможен"
 
-#: ../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 "Аудиофайлы Wave (*.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
@@ -13062,10 +13042,10 @@
 msgstr "Аудиомаркеры из {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 "Импорт изображений"
 
-#: ../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
@@ -13896,5 +13876,5 @@
 msgstr "Невозможно отобразить 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
@@ -13906,5 +13886,5 @@
 "ошибки: {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}''..."
@@ -14952,5 +14932,99 @@
 msgstr "Цвета"
 
-#: ../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 "Отображать стрелки направления"
+
+#. 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 "Только в начале пути"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Отображать стрелки одностороннего движения"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Отображать порядковые номера сегментов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Отображать границы скачанных данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Отображать виртуальные точки в режиме выбора"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Отображать неактивные слои другим цветом"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Сглаженные линии (антиалиасинг)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Рисовать только контур области"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Точки GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Показывать направление на сегментах путей."
+
+#. 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 ""
+"Отображать стрелки для одностороннего движения и других направленых объектов."
+
+#. 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 "Показывать порядковые номера на всех сегментах линии."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Применить сглаживание карты."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Отображать границы области, скачанной с сервера."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
+
+#. 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 "Отображать неактивные слои данных другим цветом."
+
+#: ../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 "Эта опция блокирует заполнение областей, несмотря на выбранный стиль."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Данные OSM"
+
+#: ../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 "Использовать глобальные настройки."
+
+#: ../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
@@ -14961,10 +15035,10 @@
 msgstr "Все"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../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
@@ -14973,14 +15047,15 @@
 msgstr "Нет"
 
-#: ../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 "Отображать линии, даже если нет импортированых сегментов."
 
-#: ../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 "Отображать GPS большими точками"
 
-#: ../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 ""
@@ -14988,14 +15063,14 @@
 "окружностью."
 
-#: ../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 "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../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 ""
 "Направление (красный = запад, желтый = север, зелёный = восток, синий = юг)"
 
-#: ../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 ""
@@ -15003,5 +15078,9 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цветом (может быть определено для именованных слоёв)"
@@ -15009,5 +15088,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"
@@ -15031,5 +15110,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
@@ -15072,5 +15151,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
@@ -15084,61 +15163,22 @@
 msgstr "Пешком"
 
-#: ../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 "Отображать стрелки направления"
-
-#: ../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 "Создавать маркеры, читая GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
-#. 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 "Только в начале пути"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Отображать стрелки одностороннего движения"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Отображать порядковые номера сегментов"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Отображать границы скачанных данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Отображать виртуальные точки в режиме выбора"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Отображать неактивные слои другим цветом"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Сглаженные линии (антиалиасинг)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Создавать маркеры, читая GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Рисовать только контур области"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Авто"
 
 #. 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"
@@ -15146,14 +15186,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 "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Оба"
 
-#: ../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 "
@@ -15162,9 +15203,11 @@
 "Автоматически создавать слой меток из путевых точек при открытии GPX слоя"
 
-#: ../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 "Рисовать линии между точками GPS"
 
-#: ../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 "
@@ -15174,9 +15217,10 @@
 "чтобы рисовать все линии."
 
-#: ../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 "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../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."
@@ -15185,21 +15229,20 @@
 "чтобы отображать все линии."
 
-#: ../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 "Максимальная длина (в метрах)"
 
 #. 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."
 msgstr "Отображать линии, даже если нет импортированой информации о линиях."
 
-#: ../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 "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. 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 ""
@@ -15208,5 +15251,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 "
@@ -15214,13 +15257,14 @@
 msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
 
-#: ../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 "Минимальное расстояние (в пикселях)"
 
-#: ../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 "Отображать точки GPS более жирно"
 
-#: ../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 "
@@ -15230,13 +15274,13 @@
 "Менеджере Слоев."
 
-#: ../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 "Цвета точек и сегментов треков по скорости."
 
-#: ../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 ""
 
-#: ../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 "
@@ -15246,64 +15290,28 @@
 "устройство захвата требует регистрации этой информации."
 
-#: ../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 ""
+
+#. 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 "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../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 "Раскрасить треки и точки"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Отображение путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Точки GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Показывать направление на сегментах путей."
-
-#. 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 ""
-"Отображать стрелки для одностороннего движения и других направленых объектов."
-
-#. 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 "Показывать порядковые номера на всех сегментах линии."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Применить сглаживание карты."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Отображать границы области, скачанной с сервера."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
-
-#. 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 "Отображать неактивные слои данных другим цветом."
-
-#: ../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 "Эта опция блокирует заполнение областей, несмотря на выбранный стиль."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Данные OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17234,26 +17242,25 @@
 "{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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Скачивание отношения ''{0}''  с сервера"
+msgstr ""
 
 #: ../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 ""
-"Предупреждение: не удалось прочитать MOTD из ''{0}''. Текст ошибки: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -19071,5 +19078,6 @@
 msgstr "Не могу найти перевод {0}. Возвращено к {1}."
 
-#: ../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 ""
@@ -19080,5 +19088,5 @@
 "проблема конфигурации. JOSM прекращает работу."
 
-#: ../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}"
@@ -19086,6 +19094,6 @@
 "Предупреждение: не удалось обработать файл .zip {0}''. Текст ошибки: {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 ""
@@ -37078,9 +37086,9 @@
 msgstr "Показать неполные адреса"
 
-#: ../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 "элементы"
 
-#: ../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 "элементы отсутствуют"
@@ -37182,5 +37190,5 @@
 msgstr "Выделить все адреса с неполными данными."
 
-#: ../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 "Свойства слоя"
@@ -38193,7 +38201,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Включить автоматическое кеширование."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38295,7 +38302,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Отменить текущую область (только векторные изображения)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38991,4 +38997,20 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Настроить отрисовку линий"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Отображать линии между точками для этого слоя."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Не отображать линии между точками для этого слоя."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Выбрать варианты отрисовки линий"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39616,12 +39638,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Скрыть эту кнопку"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Скрыть эту кнопку"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -39630,14 +39650,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} км/ч"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Грунтовка 3 класса"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -41265,5 +41281,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}"
@@ -41271,5 +41287,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: "
@@ -43801,11 +43817,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Пожалуйста, выберите как минимум 2 точки или точку, близко расположеную к "
-"другой."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44765,4 +44778,7 @@
 #~ msgid "Footway"
 #~ msgstr "Тротуар"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Грунтовка 3 класса"
 
 #~ msgid "Track Grade 1"
@@ -48835,4 +48851,7 @@
 #~ msgstr "Северная геодезическая система UTM20"
 
+#~ msgid "Downloading relation ''{0}''"
+#~ msgstr "Скачивание отношения ''{0}''  с сервера"
+
 #~ msgid "Please enter a latitude in the range -90..90"
 #~ msgstr "Введите широту в диапазоне -90..90"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 26406)
+++ applications/editors/josm/i18n/po/sk.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 16:05+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:36+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:45+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
@@ -1210,5 +1210,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
@@ -1451,5 +1451,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"
@@ -2451,5 +2451,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
@@ -8084,5 +8084,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 ""
@@ -9577,5 +9577,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
@@ -12589,16 +12589,16 @@
 msgstr "Prispôsobiť farbu"
 
-#: ../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 "Predvolené"
 
-#: ../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 "Zvoľte farbu"
 
-#: ../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
@@ -12608,6 +12608,6 @@
 msgstr "Meno: {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
@@ -12617,5 +12617,5 @@
 msgstr "Popis: {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
@@ -12628,5 +12628,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
@@ -12638,16 +12638,16 @@
 msgstr "Popis"
 
-#: ../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 "Časový interval"
 
-#: ../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 "Dĺžka"
 
-#: ../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
@@ -12656,6 +12656,6 @@
 msgstr "Dĺžka: {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
@@ -12667,6 +12667,6 @@
 msgstr[2] "{0} trás, "
 
-#: ../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
@@ -12678,11 +12678,11 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../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 poloha bodu"
 
-#: ../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
@@ -12693,10 +12693,10 @@
 msgstr[2] "{0} stôp(track), "
 
-#: ../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 "Konvertovať do dátovej vrstvy"
 
-#: ../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."
@@ -12706,10 +12706,10 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</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
@@ -12720,7 +12720,7 @@
 msgstr "Prevedené z: {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
@@ -12731,5 +12731,5 @@
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../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
@@ -12737,5 +12737,5 @@
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../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
@@ -12744,5 +12744,5 @@
 msgstr "{0} metrov"
 
-#: ../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
@@ -12750,5 +12750,5 @@
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../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
@@ -12757,25 +12757,25 @@
 msgstr "{0} štvorcových 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 "Stiahnuť okolo:"
 
-#: ../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 "iba stopy(track)"
 
-#: ../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 "iba waypointy"
 
-#: ../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 "stopy a waypointy"
 
-#: ../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
@@ -12788,10 +12788,10 @@
 "<br>Chcete pokračovať?</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."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../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 ""
@@ -12802,5 +12802,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../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 ""
@@ -12811,35 +12811,15 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Prispôsobiť kresliacu trasu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Použíť globálne nastavenie."
-
-#: ../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 "Kresliť spojnice medzi bodmi v tejto vrstve"
-
 #: ../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 "Nekresliť spojnice mezi bodmi v tejto vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Výber nastavenia kreslenej čiary"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../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
@@ -12847,10 +12827,10 @@
 msgstr "Pomenovanie trackpoints od {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 "Importovať zvuk"
 
-#: ../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
@@ -12863,6 +12843,6 @@
 "cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</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
@@ -12870,10 +12850,10 @@
 msgstr "Import nie je možný"
 
-#: ../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 "Wave Audiosúbory (*.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
@@ -12881,10 +12861,10 @@
 msgstr "Zukové značky z {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 "Importovať obrázky"
 
-#: ../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
@@ -13703,5 +13683,5 @@
 msgstr "Chyba zobrazovania 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
@@ -13713,5 +13693,5 @@
 "{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}''..."
@@ -14737,5 +14717,99 @@
 msgstr "Farby"
 
-#: ../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 "Kresliť šípky v smere jazdy"
+
+#. 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 "Iba na začiatku cesty."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Vykresliť segmenty s poradovými číslami"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Vykresliť ohraničujúci box stiahnutých dát"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Vykresľovať virtuálne body v mode výberu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Vyhladené mapy (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS body"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Kresliť smer cestného segmentu"
+
+#. 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 ""
+
+#. 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 "Kresliť poradové čísla všetkých segmentov v rámci cesty."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr ""
+"Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Zobrazovať hranice dát stiahnutých zo servera."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
+
+#. 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 "Zobrazovať neaktívne vrstvy dát inou farbou."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM údaje"
+
+#: ../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 "Použíť globálne nastavenie."
+
+#: ../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
@@ -14746,10 +14820,10 @@
 msgstr "Všetko"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Miestne súbory"
 
-#: ../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
@@ -14758,30 +14832,35 @@
 msgstr "Žiadny"
 
-#: ../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 "Zosilniť líniu, ak žiadne segmenty nie su naimportované."
 
-#: ../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 "Kresliť väčšie GPS body"
 
-#: ../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 "Kresliť kruh z HDOP hodnoty."
 
-#: ../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 "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../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 ""
 
-#: ../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 "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -14789,5 +14868,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"
@@ -14811,5 +14890,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
@@ -14852,5 +14931,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
@@ -14864,61 +14943,22 @@
 msgstr "Pešo"
 
-#: ../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 "Kresliť šípky v smere jazdy"
-
-#: ../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 "Vytvorenie markerov pri čítaní GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
-#. 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 "Iba na začiatku cesty."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Vykresliť segmenty s poradovými číslami"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Vykresliť ohraničujúci box stiahnutých dát"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Vykresľovať virtuálne body v mode výberu"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Vyhladené mapy (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Vytvorenie markerov pri čítaní GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Automaticky"
 
 #. 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"
@@ -14926,14 +14966,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 "Desc(ription(popis))"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Oba"
 
-#: ../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 "
@@ -14942,9 +14983,11 @@
 "Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
 
-#: ../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 "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../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 "
@@ -14954,9 +14997,10 @@
 "''-1'' pre kresbu všetkých čiar."
 
-#: ../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 "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
-#: ../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."
@@ -14965,10 +15009,10 @@
 "kreslenie všetkých línií."
 
-#: ../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 "Maximálna dĺžka (metrov)"
 
 #. 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."
@@ -14977,11 +15021,10 @@
 "čiarach."
 
-#: ../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 "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. 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 ""
@@ -14990,5 +15033,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 "
@@ -14996,13 +15039,14 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../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 "Minimálna vzdialenosť (pixelov)"
 
-#: ../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 "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../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 "
@@ -15012,13 +15056,13 @@
 "v  manažéri vrstiev."
 
-#: ../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 "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../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 ""
 
-#: ../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 "
@@ -15028,5 +15072,10 @@
 "pre digitalizáciu musia zaznamenať informácie."
 
-#: ../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 ""
+
+#. 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 ""
@@ -15034,60 +15083,19 @@
 "rýchlostí."
 
-#: ../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 "Farebná trať a body"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Značenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS body"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Kresliť smer cestného segmentu"
-
-#. 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 ""
-
-#. 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 "Kresliť poradové čísla všetkých segmentov v rámci cesty."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr ""
-"Aplikovať vyhladzovanie (antialiasing) v mape pre jemnejšie zobrazenie."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Zobrazovať hranice dát stiahnutých zo servera."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
-
-#. 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 "Zobrazovať neaktívne vrstvy dát inou farbou."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM údaje"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16986,25 +16994,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Sťahovanie relácie ''{0}''"
+msgstr ""
 
 #: ../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 "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18801,5 +18809,6 @@
 msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
 
-#: ../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 ""
@@ -18810,5 +18819,5 @@
 "problém. JOSM prestane pracovať."
 
-#: ../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}"
@@ -18816,6 +18825,6 @@
 "Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {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 ""
@@ -36747,9 +36756,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36848,5 +36857,5 @@
 msgstr "Vyberie všetky adresy s neúplnými údajmi."
 
-#: ../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 "Vlastnosti vrstvy"
@@ -37794,7 +37803,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Povoliť automatické cachovanie."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37894,7 +37902,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Kliknutím zrušíte aktuálnu operáciu"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38588,4 +38595,20 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Prispôsobiť kresliacu trasu"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Výber nastavenia kreslenej čiary"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39200,12 +39223,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Skryť toto tlačítko"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Skryť toto tlačítko"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -39214,14 +39235,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Kvalita stopy poľnej cesty 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40823,5 +40840,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}"
@@ -40829,5 +40846,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 ""
@@ -43292,11 +43309,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Vyberte prosím aspoň dva body na zlúčenie, alebo bod, ktorý je blízko iného "
-"bodu."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -45064,4 +45078,7 @@
 #~ msgid "Check for paint notes."
 #~ msgstr "Kontrola pre poznámky (notes)"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Kvalita stopy poľnej cesty 3"
 
 #~ msgid "Track Grade 2"
@@ -48813,4 +48830,7 @@
 #~ msgstr "UTM20 North Geodesic system"
 
+#~ msgid "Downloading relation ''{0}''"
+#~ msgstr "Sťahovanie relácie ''{0}''"
+
 #~ msgid "Could not create a node with the entered latitude/longitude."
 #~ msgstr "Nemôžem vytvoriť body so vstupnými súradnicami šírka/dĺžka."
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 26406)
+++ applications/editors/josm/i18n/po/sv.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 16:29+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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:33+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:42+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
@@ -1219,5 +1219,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
@@ -1458,5 +1458,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"
@@ -2452,5 +2452,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
@@ -7979,5 +7979,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 ""
@@ -9457,5 +9457,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
@@ -12258,16 +12258,16 @@
 msgstr "Anpassa färger"
 
-#: ../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 "Standard"
 
-#: ../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 "Välj en färg"
 
-#: ../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
@@ -12277,6 +12277,6 @@
 msgstr "Namn: {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
@@ -12286,5 +12286,5 @@
 msgstr "Beskrivning: {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
@@ -12296,5 +12296,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
@@ -12306,16 +12306,16 @@
 msgstr "Beskrivning"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12324,6 +12324,6 @@
 msgstr ""
 
-#: ../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
@@ -12334,6 +12334,6 @@
 msgstr[1] "{0} rutter, "
 
-#: ../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
@@ -12344,11 +12344,11 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../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
@@ -12358,10 +12358,10 @@
 msgstr[1] "{0} spår, "
 
-#: ../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 "Omvandla till datalager"
 
-#: ../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."
@@ -12369,10 +12369,10 @@
 msgstr ""
 
-#: ../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
@@ -12383,7 +12383,7 @@
 msgstr "Omvandlad från:{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
@@ -12394,5 +12394,5 @@
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../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
@@ -12400,5 +12400,5 @@
 msgstr "Hämta allting inom:"
 
-#: ../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
@@ -12407,5 +12407,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
@@ -12413,5 +12413,5 @@
 msgstr "Största tillåtna område per begäran:"
 
-#: ../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
@@ -12420,25 +12420,25 @@
 msgstr "{0} km2"
 
-#: ../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 "Hämta hem i närheten av:"
 
-#: ../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 ""
 
-#: ../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 "enbart sträckpunkter"
 
-#: ../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 "spår och sträckpunkter"
 
-#: ../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
@@ -12451,10 +12451,10 @@
 "Önskar du<br>fortsätta?</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."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../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 ""
@@ -12465,5 +12465,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../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 ""
@@ -12474,35 +12474,15 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Anpassa linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Använd globala inställningar"
-
-#: ../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 "Rita linjer mellan punkter i detta lager."
-
 #: ../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 "Rita inte linjer mellan punkter i detta lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Välj alternativ för linjeritning"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../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
@@ -12510,10 +12490,10 @@
 msgstr "Namngivna spårpunkter från {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 "Importera ljud"
 
-#: ../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
@@ -12524,6 +12504,6 @@
 msgstr ""
 
-#: ../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
@@ -12531,10 +12511,10 @@
 msgstr ""
 
-#: ../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 "Wave-ljudfiler (*.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
@@ -12542,10 +12522,10 @@
 msgstr "Ljudmarkörer från {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 "Importera bilder"
 
-#: ../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
@@ -13337,5 +13317,5 @@
 msgstr "Fel vid visning av 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
@@ -13345,5 +13325,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14277,5 +14257,99 @@
 msgstr "Färger"
 
-#: ../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 "Rita riktningspilar"
+
+#. 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 "Enbart på en sträckas huvud."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Rita ut segmentens ordningsnummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Rita gränser för hämtade data"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Rita virtuella noder i urvalsläge"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Rita inaktiva lager i avvikande färg"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Mjuk kartgrafik (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS-punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Rita riktningsanvisningar för delsträckor."
+
+#. 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 ""
+
+#. 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 "Rita ordningsnummer för alla delsträckor inom deras sträcka."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Rita gränser för data hämtade från servern."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Rita virtuella noder i urvalsläge för underlätta förändring av sträckor."
+
+#. 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 "Rita de inaktiva datalagren i avvikande färg."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM-data"
+
+#: ../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 "Använd globala inställningar"
+
+#: ../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
@@ -14286,10 +14360,10 @@
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../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
@@ -14298,30 +14372,35 @@
 msgstr "Inget"
 
-#: ../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 "Tvinga linjer om inga segment importerats."
 
-#: ../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 "Rita stora GPS-punkter"
 
-#: ../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 ""
 
-#: ../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 "Hastighet (röd = långsam, grön = snabb)"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -14329,5 +14408,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"
@@ -14351,5 +14430,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
@@ -14392,5 +14471,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
@@ -14404,61 +14483,22 @@
 msgstr "Fotgängare"
 
-#: ../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 "Rita riktningspilar"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
-#. 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 "Enbart på en sträckas huvud."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Rita ut segmentens ordningsnummer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Rita gränser för hämtade data"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Rita virtuella noder i urvalsläge"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Rita inaktiva lager i avvikande färg"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Mjuk kartgrafik (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14466,14 +14506,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14483,9 +14524,11 @@
 "tillgängliga sträckpunkter."
 
-#: ../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 "Rita linjer mellan råa GPS-punkter"
 
-#: ../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 "
@@ -14495,9 +14538,10 @@
 "längd."
 
-#: ../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 ""
 
-#: ../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."
@@ -14506,10 +14550,10 @@
 "längd."
 
-#: ../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 "Maxlängd (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."
@@ -14518,11 +14562,10 @@
 "linjeinformation."
 
-#: ../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 "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. 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 ""
@@ -14531,5 +14574,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 "
@@ -14539,13 +14582,14 @@
 "senast ritade pil."
 
-#: ../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 "Minimiavstånd (pixlar)"
 
-#: ../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 "Rita större punkter för GPS-punkter."
 
-#: ../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 "
@@ -14555,13 +14599,13 @@
 "hjälp av lagerhanteraren."
 
-#: ../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 "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../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 ""
 
-#: ../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 "
@@ -14569,64 +14613,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../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 "Spår- och punktfärgläggning"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Rita riktningsanvisningar för delsträckor."
-
-#. 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 ""
-
-#. 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 "Rita ordningsnummer för alla delsträckor inom deras sträcka."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Rita gränser för data hämtade från servern."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Rita virtuella noder i urvalsläge för underlätta förändring av sträckor."
-
-#. 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 "Rita de inaktiva datalagren i avvikande färg."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM-data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16424,24 +16432,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Hämtar {0} objekt från ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -18079,5 +18087,6 @@
 "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
 
-#: ../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 ""
@@ -18086,11 +18095,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35956,9 +35965,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36057,5 +36066,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -36977,7 +36986,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Aktivera automatisk cachning."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37071,7 +37079,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Klicka för att avbryta den pågående åtgärden"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37741,4 +37748,20 @@
 "skicka in spår, se här:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Anpassa linjeritning"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Rita linjer mellan punkter i detta lager."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Rita inte linjer mellan punkter i detta lager."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Välj alternativ för linjeritning"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38353,12 +38376,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Dölj denna knapp"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Dölj denna knapp"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38367,14 +38388,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Bruksväg klass 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39971,5 +39988,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}"
@@ -39977,5 +39994,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 ""
@@ -42377,11 +42394,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Vänligen välj åtminstone två noder att slå ihop eller en nod som ligger nära "
-"en annan nod."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43781,4 +43795,7 @@
 #~ msgid "Bridleway"
 #~ msgstr "Gång-/Ridstig"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Bruksväg klass 3"
 
 #~ msgid "Track Grade 2"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 26406)
+++ applications/editors/josm/i18n/po/tr.po	(revision 26428)
@@ -10,5 +10,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-19 17:46+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,6 +19,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:32+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:42+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -79,5 +79,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
@@ -165,5 +165,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
@@ -397,5 +397,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
@@ -1202,5 +1202,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
@@ -1428,5 +1428,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"
@@ -2368,5 +2368,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
@@ -7764,5 +7764,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 ""
@@ -9236,5 +9236,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
@@ -12004,16 +12004,16 @@
 msgstr "Renkleri Ayarla"
 
-#: ../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 "Varsayılan"
 
-#: ../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 "Renk seç"
 
-#: ../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
@@ -12023,6 +12023,6 @@
 msgstr "İsim: {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
@@ -12032,5 +12032,5 @@
 msgstr "Tanım: {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
@@ -12042,5 +12042,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
@@ -12052,16 +12052,16 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12070,6 +12070,6 @@
 msgstr ""
 
-#: ../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
@@ -12079,6 +12079,6 @@
 msgstr[0] "{0} rut, "
 
-#: ../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
@@ -12088,11 +12088,11 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../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 noktası"
 
-#: ../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
@@ -12101,10 +12101,10 @@
 msgstr[0] "{0} iz, "
 
-#: ../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 "Bilgi tabakasına çevir"
 
-#: ../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."
@@ -12112,10 +12112,10 @@
 msgstr ""
 
-#: ../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
@@ -12126,7 +12126,7 @@
 msgstr "Çevrildiği yer: {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
@@ -12137,5 +12137,5 @@
 msgstr "OSM den bu izi indir"
 
-#: ../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
@@ -12143,5 +12143,5 @@
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../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
@@ -12150,5 +12150,5 @@
 msgstr "{0} metre"
 
-#: ../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
@@ -12156,5 +12156,5 @@
 msgstr "Her istek için max. alan:"
 
-#: ../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
@@ -12163,25 +12163,25 @@
 msgstr "{0} km2"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -12194,10 +12194,10 @@
 "istiyor musunuz?</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."
 msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../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 ""
@@ -12206,5 +12206,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -12214,35 +12214,15 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Çizimi özelleştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Genel ayarları kullan."
-
-#: ../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 "Bu tabaka için çizgiler arasını birleştir."
-
 #: ../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 "Bu tabaka için çizgileri birleştirme."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../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
@@ -12250,10 +12230,10 @@
 msgstr "{0} isim verilen izler"
 
-#: ../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 "Sesi içeri al"
 
-#: ../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
@@ -12264,6 +12244,6 @@
 msgstr ""
 
-#: ../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
@@ -12271,10 +12251,10 @@
 msgstr ""
 
-#: ../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 "Wave Audio files (*.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
@@ -12282,10 +12262,10 @@
 msgstr "{0} daki ses imleçleri"
 
-#: ../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 "Görüntüleri içeri al"
 
-#: ../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
@@ -13074,5 +13054,5 @@
 msgstr "Linkin gösterilmesinde hata"
 
-#: ../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
@@ -13082,5 +13062,5 @@
 msgstr ""
 
-#: ../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}''..."
@@ -14006,5 +13986,98 @@
 msgstr "Renkler"
 
-#: ../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 "Yön oklarını çiz"
+
+#. 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 "Sadece yolun başında"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Segment sıra numaralarını çiz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "İndirilen alan için sınırları çiz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Seçim modunda sanal kavşakları çiziniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Pasif tabakaları başka renkte çiz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Düzgün harita grafikleri (antialiasing)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS Noktaları"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Yol segmentleri için yön ipuçları çiz."
+
+#. 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 ""
+
+#. 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 "Her segment için kendi yolu buyunca sıra numarası çiz."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Daha düzgün harita grafikleri için ''antialiasing'' uygula  ."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Server’dan gelen bilginin sınırlarını çiz ."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
+
+#. 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 "Pasif tabakaları farklı renklerde çiz."
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM Data"
+
+#: ../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 "Genel ayarları kullan."
+
+#: ../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
@@ -14015,10 +14088,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr ""
 
-#: ../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
@@ -14027,30 +14100,35 @@
 msgstr ""
 
-#: ../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 "Herhangi bir segment içeri alınmadıysa çizgileri zorla."
 
-#: ../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 "Geniş gps noktaları çiz."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14058,5 +14136,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"
@@ -14080,5 +14158,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
@@ -14121,5 +14199,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
@@ -14133,61 +14211,22 @@
 msgstr "Ayak"
 
-#: ../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 "Yön oklarını çiz"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
-#. 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 "Sadece yolun başında"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Segment sıra numaralarını çiz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "İndirilen alan için sınırları çiz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Seçim modunda sanal kavşakları çiziniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Pasif tabakaları başka renkte çiz"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Düzgün harita grafikleri (antialiasing)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr ""
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr ""
 
 #. 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"
@@ -14195,14 +14234,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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr ""
 
-#: ../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 "
@@ -14211,9 +14251,11 @@
 "GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
 
-#: ../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 ""
 
-#: ../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 "
@@ -14221,9 +14263,10 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
@@ -14232,26 +14275,25 @@
 "''-1'' yap."
 
-#: ../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 "Maximum uzunluk (metre)"
 
 #. 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."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../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 "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. 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 "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. 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 "
@@ -14259,13 +14301,14 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../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 "Minimum uzaklık (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 "GPS noktaları için geniş nokta çiz."
 
-#: ../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 "
@@ -14273,13 +14316,13 @@
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -14287,63 +14330,28 @@
 msgstr ""
 
-#: ../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 ""
+
+#. 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 "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS Noktaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Yol segmentleri için yön ipuçları çiz."
-
-#. 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 ""
-
-#. 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 "Her segment için kendi yolu buyunca sıra numarası çiz."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Daha düzgün harita grafikleri için ''antialiasing'' uygula  ."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Server’dan gelen bilginin sınırlarını çiz ."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
-
-#. 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 "Pasif tabakaları farklı renklerde çiz."
-
-#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM Data"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16128,24 +16136,24 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "WMS mozaiği indir {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
-msgid ""
-"Error: failed to read from ''{0}''. Server responded with status code {1}."
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
 
@@ -17765,5 +17773,6 @@
 msgstr ""
 
-#: ../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 ""
@@ -17772,11 +17781,11 @@
 msgstr ""
 
-#: ../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}"
 msgstr ""
 
-#: ../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 ""
@@ -35631,9 +35640,9 @@
 msgstr ""
 
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+msgid "items"
+msgstr ""
+
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
-msgid "items"
-msgstr ""
-
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35732,5 +35741,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -37403,4 +37412,20 @@
 "yüklemek isterseniz buraya bakınız:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Çizimi özelleştir"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Bu tabaka için çizgiler arasını birleştir."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Bu tabaka için çizgileri birleştirme."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Çizim seçeneklerini seçiniz"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38015,7 +38040,6 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Sakla"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
@@ -38028,14 +38052,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} km/h"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "İz derecesi 1"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39626,5 +39646,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}"
@@ -39632,5 +39652,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 ""
@@ -42025,9 +42045,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43789,4 +43808,7 @@
 #~ msgid "Please select the row to copy."
 #~ msgstr "Kopyalamak için bir satır seçiniz."
+
+#~ msgid "Download WMS tile from {0}"
+#~ msgstr "WMS mozaiği indir {0}"
 
 #~ msgid "Exception occurred"
@@ -43906,4 +43928,7 @@
 #~ msgstr "Yürüyüş Yolu"
 
+#~ msgid "Track Grade 1"
+#~ msgstr "İz derecesi 1"
+
 #~ msgid "Track Grade 2"
 #~ msgstr "İz derecesi 2"
@@ -44103,4 +44128,7 @@
 #~ "\"{1}\">türkçe</A> olarak oluştur."
 
+#~ msgid "Please select at least two nodes to merge."
+#~ msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
+
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 26406)
+++ applications/editors/josm/i18n/po/uk.po	(revision 26428)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
-"PO-Revision-Date: 2011-07-21 13:44+0000\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"PO-Revision-Date: 2011-07-29 12:50+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,6 +18,6 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:33+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:44+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -78,5 +78,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
@@ -165,5 +165,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
@@ -405,5 +405,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
@@ -1226,5 +1226,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
@@ -1470,5 +1470,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"
@@ -2485,5 +2485,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
@@ -8199,5 +8199,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 "Перезавантаження джерел стилів"
@@ -9690,5 +9690,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
@@ -12735,16 +12735,16 @@
 msgstr "Налаштувати колір"
 
-#: ../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 "Типовий"
 
-#: ../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 "Вибрати колір"
 
-#: ../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
@@ -12754,6 +12754,6 @@
 msgstr "Назва: {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
@@ -12763,5 +12763,5 @@
 msgstr "Опис: {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
@@ -12774,5 +12774,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
@@ -12784,16 +12784,16 @@
 msgstr "Опис"
 
-#: ../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 "Період"
 
-#: ../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 "Довжина"
 
-#: ../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
@@ -12802,6 +12802,6 @@
 msgstr "Довжина: {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
@@ -12813,6 +12813,6 @@
 msgstr[2] "{0} маршрутів, "
 
-#: ../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
@@ -12824,11 +12824,11 @@
 msgstr[2] "{0} маршрутних точок"
 
-#: ../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"
 
-#: ../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
@@ -12839,10 +12839,10 @@
 msgstr[2] "{0} треків, "
 
-#: ../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 "Перетворити в шар даних"
 
-#: ../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."
@@ -12853,10 +12853,10 @@
 "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
@@ -12867,7 +12867,7 @@
 msgstr "Перетворено з: {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
@@ -12878,5 +12878,5 @@
 msgstr "Завантажити з OSM дані уздовж цього треку"
 
-#: ../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
@@ -12884,5 +12884,5 @@
 msgstr "Завантажити всі в межах:"
 
-#: ../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
@@ -12891,5 +12891,5 @@
 msgstr "{0} метрів"
 
-#: ../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
@@ -12897,5 +12897,5 @@
 msgstr "Максимальна ділянка для одного запиту:"
 
-#: ../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
@@ -12904,25 +12904,25 @@
 msgstr "{0} кв. км."
 
-#: ../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 "Завантажити біля:"
 
-#: ../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 "тільки треки"
 
-#: ../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 "тільки маршрутні точки"
 
-#: ../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 "треки та маршрутні точки"
 
-#: ../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
@@ -12935,10 +12935,10 @@
 "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."
 msgstr "На шарі відсутній трек GPX, щоб накласти звук."
 
-#: ../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 ""
@@ -12949,5 +12949,5 @@
 "будуть пропущені або перенесені на початок треку."
 
-#: ../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 ""
@@ -12958,35 +12958,15 @@
 "при розрахунку часу."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "Налаштувати креслення ліній"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Використовувати загальні налаштування"
-
-#: ../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 "Креслити лінії між точками цього шару."
-
 #: ../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 "Не креслити лінії між точками цього шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "Вибрати варіанти креслення ліній"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "Позначки з іменованих точок"
 
-#: ../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
@@ -12994,10 +12974,10 @@
 msgstr "Іменовані точки треку з {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 "Імпортувати аудіо"
 
-#: ../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
@@ -13010,6 +12990,6 @@
 "містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</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
@@ -13017,10 +12997,10 @@
 msgstr "Імпорт неможливий"
 
-#: ../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 "Аудіофайли Wave (*.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
@@ -13028,10 +13008,10 @@
 msgstr "Аудіо-позначки з {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 "Імпорт зображень"
 
-#: ../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
@@ -13862,5 +13842,5 @@
 msgstr "Помилка показу 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
@@ -13871,5 +13851,5 @@
 "Попередження: не вдалося завантажити стилі Mappaint з ''{0}''. Помилка: {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}''..."
@@ -14909,5 +14889,103 @@
 msgstr "Кольори"
 
-#: ../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 "Показувати стрілки напрямку"
+
+#. 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 "Тільки на початку лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "Стрілки для одностороннього руху."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "Показувати порядкові номери відрізків"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "Показувати межі завантажених даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "Показувати віртуальні точки в режимі вибору"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "Показувати неактивні шари іншим кольором"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Згладжені лінії (антіаліасінг)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "Креслити тільки зовнішні контури ділянок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "Точки GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "Показувати напрямок на відрізках ліній."
+
+#. 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 ""
+"Показувати стрілки для доріг з одностороннім рухом та для інших елементів, "
+"що мають напрямок."
+
+#. 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 "Показувати порядкові номери на всіх відрізках лінії."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Застосувати згладжування мапи."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Показувати межі ділянки, завантаженої з сервера."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Показувати віртуальні точки в режимі вибору, для зручності редагування."
+
+#. 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 "Показувати неактивні шари даних іншим кольором."
+
+#: ../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 ""
+"Ця опція пригнічує заповнення ділянок, відкидаючи будь що, що зазначено в "
+"обраному стилі."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "Дані OSM"
+
+#: ../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 "Використовувати загальні налаштування"
+
+#: ../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
@@ -14918,10 +14996,10 @@
 msgstr "Всі"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "Локальні файли"
 
-#: ../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
@@ -14930,32 +15008,37 @@
 msgstr "Нічого"
 
-#: ../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 "Показувати лінії, навіть якщо немає імпортованих відрізків."
 
-#: ../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 "Показувати GPS великими точками"
 
-#: ../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 ""
 "Показати значення HDOP (зниження точності в горизонтальній площині) колом."
 
-#: ../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 "Швидкість (червоний = повільно, зелений = швидко)"
 
-#: ../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 ""
 "Напрямок (червоний = захід, жовтий = північ, зелений = схід, синій = південь)"
 
-#: ../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 "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним кольором (може бути визначено для іменованих шарів)"
@@ -14963,5 +15046,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"
@@ -14985,5 +15068,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
@@ -15026,5 +15109,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
@@ -15038,61 +15121,22 @@
 msgstr "Пішки"
 
-#: ../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 "Показувати стрілки напрямку"
-
-#: ../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 "Створювати мітки читаючи GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "Швидке креслення (виглядає гірше)"
 
-#. 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 "Тільки на початку лінії."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "Стрілки для одностороннього руху."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "Показувати порядкові номери відрізків"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "Показувати межі завантажених даних"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "Показувати віртуальні точки в режимі вибору"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "Показувати неактивні шари іншим кольором"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "Згладжені лінії (антіаліасінг)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "Створювати мітки читаючи GPX."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "Креслити тільки зовнішні контури ділянок"
-
-#: ../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 "Динамічний діапазон кольорів заснований на обмеженнях даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "Авто"
 
 #. 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"
@@ -15100,14 +15144,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 "Опис"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "Всі"
 
-#: ../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 "
@@ -15117,9 +15162,11 @@
 "GPX шару."
 
-#: ../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 "Показувати лінії між точками GPS"
 
-#: ../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 "
@@ -15129,9 +15176,10 @@
 "щоб показувати всі лінії."
 
-#: ../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 "Максимальна довжина для локальних файлів (в метрах)"
 
-#: ../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."
@@ -15140,21 +15188,20 @@
 "показувати всі лінії."
 
-#: ../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 "Максимальна довжина (в метрах)"
 
 #. 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."
 msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
-#: ../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 "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. 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 ""
@@ -15163,5 +15210,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 "
@@ -15170,13 +15217,14 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../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 "Мінімальна відстань (в пікселях)"
 
-#: ../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 "Показувати точки GPS великими."
 
-#: ../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 "
@@ -15186,13 +15234,13 @@
 "Менеджері Шарів."
 
-#: ../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 "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../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 "Розфарбовувати точки та треки за напрямом."
 
-#: ../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 "
@@ -15202,68 +15250,28 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../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 ""
+
+#. 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 "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
-#: ../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 "Забарвлення треку та точок"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "Маркування маршрутних точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "Точки GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "Показувати напрямок на відрізках ліній."
-
-#. 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 ""
-"Показувати стрілки для доріг з одностороннім рухом та для інших елементів, "
-"що мають напрямок."
-
-#. 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 "Показувати порядкові номери на всіх відрізках лінії."
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Застосувати згладжування мапи."
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "Показувати межі ділянки, завантаженої з сервера."
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr ""
-"Показувати віртуальні точки в режимі вибору, для зручності редагування."
-
-#. 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 "Показувати неактивні шари даних іншим кольором."
-
-#: ../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 ""
-"Ця опція пригнічує заповнення ділянок, відкидаючи будь що, що зазначено в "
-"обраному стилі."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "Дані OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -17178,25 +17186,25 @@
 "наступного разу: {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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "Завантаження {0} об’єкту з ''{1}''"
+msgstr "Завантаження перенаправлено на ''{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 "Попередження: не вдалося прочитати з MOTD ''{0}''. Помилка: {1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -19015,5 +19023,6 @@
 msgstr "Не вдається знайти переклад мовою «{0}». Повертаємось до {1}."
 
-#: ../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 ""
@@ -19024,11 +19033,11 @@
 "проблемою налаштувань. JOSM не буде працювати."
 
-#: ../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}"
 msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {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 ""
@@ -37015,9 +37024,9 @@
 msgstr "Показати неповні адреси"
 
-#: ../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 "елементів"
 
-#: ../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 "елементи відсутні"
@@ -37119,5 +37128,5 @@
 msgstr "Виділити всі адреси з неповними даними."
 
-#: ../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 "Властивості Шару"
@@ -38150,7 +38159,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "Увімкнути автоматичне кешування."
+msgstr "Дозволити автоматичне кешування"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38254,7 +38262,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "Скасувати поточне захоплення (тільки векторні зображення)"
+msgstr "Скасувати поточне захоплення"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -38451,5 +38458,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:21
 msgid "Save image as PNG"
-msgstr ""
+msgstr "Зберегти зображення як PNG"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:38
@@ -38947,4 +38954,20 @@
 "вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "Налаштувати креслення ліній"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "Креслити лінії між точками цього шару."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "Не креслити лінії між точками цього шару."
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "Вибрати варіанти креслення ліній"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -39580,28 +39603,22 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "Сховати кнопку"
+msgstr "Сховати це"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "Сховати кнопку"
+msgstr "Сховати це та старіше"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
 msgid "No timestamp"
-msgstr ""
+msgstr "Немає відбитку часу"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
-msgstr ""
-"\n"
-"{0} км/г"
+msgstr "км/г"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "Ім’я закладки: "
+msgstr "Трек: "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40337,5 +40354,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
 msgid "Transfer to password manager and remove from prefence file"
-msgstr ""
+msgstr "Перемістити у менеджер паролів та вилучити із файлу налаштувань"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
@@ -41239,5 +41256,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}"
@@ -41245,5 +41262,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: "
@@ -43771,14 +43788,13 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:85
 msgid "Symmetry"
-msgstr ""
+msgstr "Симетрія"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
 msgstr ""
-"Будь ласка, виділіть що найменше дві точки для злиття або точки, які "
-"розташовані дуже близько друг до друга."
+"Будь ласка, виділіть не менше двох точок для вісі симетрії та ще щось для "
+"віддзеркалення."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44306,7 +44322,4 @@
 msgid "Drive a race car on this layer"
 msgstr "Керуйте гоночним автомобілем на цьому шарі"
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Стерти та перемістити до менеджера паролів"
 
 #~ msgid "Do not show again"
@@ -47037,2 +47050,24 @@
 #~ "виміру \"m\", \"km\", \"mi\" чи без неї.\n"
 #~ "Допускається використання формату  ФУТИ'' ДЮЙМИ\"."
+
+#~ msgid "Erase and transfer to password manager"
+#~ msgstr "Стерти та перемістити до менеджера паролів"
+
+#~ msgid ""
+#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
+#~ "'Location' header. Can''t redirect. Aborting."
+#~ msgstr ""
+#~ "Фатальна помилка: неочікувана відповідь HTTP сервера. У відповідь "
+#~ "отримано {0} без 'Location' у заголовку. Переадресування неможливе. "
+#~ "Припинення."
+
+#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
+#~ msgstr ""
+#~ "Фатальна помилка: виявлено забагато переадресувань на URL для "
+#~ "завантаження. Припинення."
+
+#~ msgid ""
+#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
+#~ msgstr ""
+#~ "Помилка: неможливо прочитати з ''{0}''. Сервер повідомив про стан кодом "
+#~ "{1}."
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 26406)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 26428)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-20 04:21+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
@@ -18,6 +18,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:29+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:40+0000\n"
+"X-Generator: Launchpad (build 13543)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -78,5 +78,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
@@ -402,5 +402,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
@@ -1204,5 +1204,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
@@ -1432,5 +1432,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"
@@ -2377,5 +2377,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
@@ -7832,5 +7832,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 "重新载入样式来源"
@@ -9305,5 +9305,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
@@ -12155,16 +12155,16 @@
 msgstr "自定义颜色"
 
-#: ../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 "默认"
 
-#: ../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 "选择一种颜色"
 
-#: ../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
@@ -12174,6 +12174,6 @@
 msgstr "名称：{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
@@ -12183,5 +12183,5 @@
 msgstr "描述：{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
@@ -12192,5 +12192,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
@@ -12202,16 +12202,16 @@
 msgstr "描述"
 
-#: ../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 "时间跨度"
 
-#: ../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 "长度"
 
-#: ../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
@@ -12220,6 +12220,6 @@
 msgstr "长度：{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
@@ -12229,6 +12229,6 @@
 msgstr[0] "{0} 条路线， "
 
-#: ../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
@@ -12238,11 +12238,11 @@
 msgstr[0] "{0} 个路点"
 
-#: ../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 点"
 
-#: ../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
@@ -12251,10 +12251,10 @@
 msgstr[0] "{0} 条轨迹， "
 
-#: ../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 "转换为数据图层"
 
-#: ../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."
@@ -12264,10 +12264,10 @@
 "请看这里：</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
@@ -12278,7 +12278,7 @@
 msgstr "转换自：{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
@@ -12289,5 +12289,5 @@
 msgstr "从 OSM 沿这条轨迹下载"
 
-#: ../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
@@ -12295,5 +12295,5 @@
 msgstr "下载这里面的每个对象："
 
-#: ../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
@@ -12302,5 +12302,5 @@
 msgstr "{0} 米"
 
-#: ../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
@@ -12308,5 +12308,5 @@
 msgstr "每个要求最大区域："
 
-#: ../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
@@ -12315,25 +12315,25 @@
 msgstr "{0} 平方公里"
 
-#: ../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 "下载接近："
 
-#: ../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 "只有轨迹"
 
-#: ../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 "只有路点"
 
-#: ../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 "轨迹与路点"
 
-#: ../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
@@ -12345,10 +12345,10 @@
 "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续？</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."
 msgstr "在图层中没有可用的 GPX 轨迹可供音频关联。"
 
-#: ../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 ""
@@ -12357,5 +12357,5 @@
 msgstr "部分时间戳记早于轨迹起点或晚于终点的路点会被忽略或是转到起点。"
 
-#: ../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 ""
@@ -12364,35 +12364,15 @@
 msgstr "部分离轨迹太远而无法明显判断其时间的路点会被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "自定义线条的绘制"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "使用全域设定值。"
-
-#: ../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 "在这个图层的各点之间绘出线条。"
-
 #: ../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 "在这个图层的各点之间不要绘出线条。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "选择线条绘制选项"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "已命名点的标记"
 
-#: ../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
@@ -12400,10 +12380,10 @@
 msgstr "{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 "输入音频"
 
-#: ../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
@@ -12416,6 +12396,6 @@
 "我们不能将它们与声音数据关联。</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
@@ -12423,10 +12403,10 @@
 msgstr "不可能输入"
 
-#: ../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 "Wave 音频文件 (*.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
@@ -12434,10 +12414,10 @@
 msgstr "{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 "输入图片"
 
-#: ../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
@@ -13230,5 +13210,5 @@
 msgstr "在显示 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
@@ -13238,5 +13218,5 @@
 msgstr "警告：从“{0}”载入 Mappaint 样式失败。例外为：{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}''..."
@@ -14210,5 +14190,98 @@
 msgstr "颜色"
 
-#: ../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 "绘制方向箭头"
+
+#. 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 "只在路径的开头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "绘出单行道箭头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "绘制区段顺序编号"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "绘出已下载数据的边界"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "在选择模式中，绘出虚拟节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "将未使用的图层以其他颜色绘制"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "平滑地图图片(反锯齿)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "只绘出区域的轮廓"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS 点"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "绘出路径区段的方向提示。"
+
+#. 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 "绘出单行道和其他有方向的对象的方向箭头。"
+
+#. 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 "绘出所有区段在其路径中的顺序编号。"
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "在地图查看应用平滑化，以产生较平滑的外观。"
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "绘出从服务器下载数据的边界。"
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "为了容易修改路径，在选择模式中绘出虚拟节点。"
+
+#. 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 "将未使用的数据图层以不同的颜色绘制。"
+
+#: ../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 "这个选项会防止填满区域，并且会覆盖在选定样式中指定的任何数值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM 数据"
+
+#: ../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 "使用全域设定值。"
+
+#: ../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
@@ -14219,10 +14292,10 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "本地文件"
 
-#: ../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
@@ -14231,30 +14304,35 @@
 msgstr "无"
 
-#: ../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 "如果没有输入区段时，强制绘出线条。"
 
-#: ../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 "绘出大型 GPS 点。"
 
-#: ../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 "从 HDOP 数值中绘制圆形。"
 
-#: ../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 "速度(红 = 慢，绿 = 快)"
 
-#: ../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 "方向(红 = 北，黄 = 西，绿 = 东，蓝 = 南)"
 
-#: ../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 "位置的稀疏度(红 = 高，绿 = 低，如果可用的话)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "单一颜色(可以为已命名的图层自定义)"
@@ -14262,5 +14340,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"
@@ -14284,5 +14362,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
@@ -14325,5 +14403,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
@@ -14337,61 +14415,22 @@
 msgstr "步行"
 
-#: ../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 "绘制方向箭头"
-
-#: ../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 "读取 GPX 时建立标记。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "快速绘制(看起来较丑)"
 
-#. 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 "只在路径的开头。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "绘出单行道箭头。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "绘制区段顺序编号"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "绘出已下载数据的边界"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "在选择模式中，绘出虚拟节点"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "将未使用的图层以其他颜色绘制"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "平滑地图图片(反锯齿)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "读取 GPX 时建立标记。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "只绘出区域的轮廓"
-
-#: ../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 "基于数据限制的动态色彩范围"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "自动"
 
 #. 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"
@@ -14399,14 +14438,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 "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "都要"
 
-#: ../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 "
@@ -14414,9 +14454,11 @@
 msgstr "开启 GPX 图层时，自动从任何路点制作标记图层。"
 
-#: ../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 "在原始 GPS 点之间绘出线条"
 
-#: ../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 "
@@ -14424,35 +14466,35 @@
 msgstr "绘出本地文件线条的最大长度(米)。设为“-1”则绘出所有的线条。"
 
-#: ../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 "本地文件最大长度(米)"
 
-#: ../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."
 msgstr "绘出线条的最大长度(米)。设为“-1”则绘出所有的线条。"
 
-#: ../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 "最大长度(米)"
 
 #. 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."
 msgstr "如果输入的数据不含线条信息，仍强制绘出线条。"
 
-#: ../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 "绘出线条的方向箭头，连接 GPS 点。"
 
 #. 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 "使用表格查询的方式绘制方向箭头，而非复杂的数学运算。"
 
 #. 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 "
@@ -14460,13 +14502,14 @@
 msgstr "如果没有离最后一个至少为这个距离，就不要绘出箭头。"
 
-#: ../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 "最小距离(像素)"
 
-#: ../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 "将 GPS 点以较大的点绘制。"
 
-#: ../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 "
@@ -14474,13 +14517,13 @@
 msgstr "所有的点和轨迹区段都使用同样的颜色。可以在图层管理程序中自定义。"
 
-#: ../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 "依速度来为点和轨迹区段上色。"
 
-#: ../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 "依方向为点和轨迹区段上色。"
 
-#: ../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 "
@@ -14488,63 +14531,28 @@
 msgstr "为地点精度 (HDOP) 的点和轨迹区段上色。您的捕获设备需要能记录这项信息。"
 
-#: ../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 ""
+
+#. 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 "允许依不同的平均速度调整轨迹颜色。"
 
-#: ../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 "轨迹与点的颜色"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "路点标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS 点"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "绘出路径区段的方向提示。"
-
-#. 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 "绘出单行道和其他有方向的对象的方向箭头。"
-
-#. 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 "绘出所有区段在其路径中的顺序编号。"
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "在地图查看应用平滑化，以产生较平滑的外观。"
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "绘出从服务器下载数据的边界。"
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "为了容易修改路径，在选择模式中绘出虚拟节点。"
-
-#. 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 "将未使用的数据图层以不同的颜色绘制。"
-
-#: ../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 "这个选项会防止填满区域，并且会覆盖在选定样式中指定的任何数值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM 数据"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16372,25 +16380,25 @@
 msgstr "无法加载 {0}，使用缓存的文件，并在下一次重试：{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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "从“{1}”下载 {0} 个对象"
+msgstr ""
 
 #: ../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 "警告：无法从“{0}”读取 MOTD。例外为：{1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18070,5 +18078,6 @@
 msgstr "找不到地区设定 {0} 的翻译。回复为 {1}。"
 
-#: ../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 ""
@@ -18077,11 +18086,11 @@
 msgstr "严重的错误：无法定位图片“{0}”。这是严重的配置问题。JOSM 会停止运作。"
 
-#: ../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}"
 msgstr "警告：无法处理 zip 文件“{0}”。例外为：{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 ""
@@ -35973,9 +35982,9 @@
 msgstr "显示不完整的地址"
 
-#: ../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 "项目"
 
-#: ../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 "没有项目"
@@ -36074,5 +36083,5 @@
 msgstr "选择有不完整数据的所有地址。"
 
-#: ../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 "图层属性"
@@ -37060,7 +37069,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "启用自动缓存。"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37156,7 +37164,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "点击以取消目前的操作"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37843,4 +37850,20 @@
 "上传轨迹，请看这里："
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "自定义线条的绘制"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "在这个图层的各点之间绘出线条。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "在这个图层的各点之间不要绘出线条。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "选择线条绘制选项"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38457,12 +38480,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "隐藏这个按钮"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "隐藏这个按钮"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38471,14 +38492,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} 公里/小时"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "书签名称： "
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40072,5 +40089,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}"
@@ -40078,5 +40095,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: "
@@ -42522,9 +42539,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "请至少选择两个要合并的节点，或是靠近另一个节点的节点。"
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 26406)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 26428)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-27 13:04+0200\n"
+"POT-Creation-Date: 2011-07-31 15:02+0200\n"
 "PO-Revision-Date: 2011-07-17 04:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-27 10:25+0000\n"
-"X-Generator: Launchpad (build 13503)\n"
+"X-Launchpad-Export-Date: 2011-07-31 11:36+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
@@ -400,5 +400,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
@@ -1201,5 +1201,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
@@ -1429,5 +1429,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"
@@ -2374,5 +2374,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
@@ -7797,5 +7797,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 "重新載入樣式來源"
@@ -9271,5 +9271,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
@@ -12119,16 +12119,16 @@
 msgstr "自訂顏色"
 
-#: ../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 "預設值"
 
-#: ../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 "選擇一種顏色"
 
-#: ../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
@@ -12138,6 +12138,6 @@
 msgstr "名稱：{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
@@ -12147,5 +12147,5 @@
 msgstr "描述：{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
@@ -12156,5 +12156,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
@@ -12166,16 +12166,16 @@
 msgstr "描述"
 
-#: ../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 "時間跨度"
 
-#: ../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 "長度"
 
-#: ../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
@@ -12184,6 +12184,6 @@
 msgstr "長度：{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
@@ -12193,6 +12193,6 @@
 msgstr[0] "{0} 路線， "
 
-#: ../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
@@ -12202,11 +12202,11 @@
 msgstr[0] "{0} 航點"
 
-#: ../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 點"
 
-#: ../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
@@ -12215,10 +12215,10 @@
 msgstr[0] "{0} 軌跡， "
 
-#: ../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 "轉換為資料圖層"
 
-#: ../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."
@@ -12228,10 +12228,10 @@
 "請看這裡：</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
@@ -12242,7 +12242,7 @@
 msgstr "轉換自：{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
@@ -12253,5 +12253,5 @@
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../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
@@ -12259,5 +12259,5 @@
 msgstr "下載這裡面的每個物件："
 
-#: ../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
@@ -12266,5 +12266,5 @@
 msgstr "{0} 公尺"
 
-#: ../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
@@ -12272,5 +12272,5 @@
 msgstr "每個要求最大區域："
 
-#: ../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
@@ -12279,25 +12279,25 @@
 msgstr "{0} 平方公里"
 
-#: ../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 "下載接近："
 
-#: ../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 "只有軌跡"
 
-#: ../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 "只有航點"
 
-#: ../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 "軌跡與航點"
 
-#: ../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
@@ -12309,10 +12309,10 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</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."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../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 ""
@@ -12321,5 +12321,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../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 ""
@@ -12328,35 +12328,15 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1355
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
-msgid "Customize line drawing"
-msgstr "自訂線條的繪製"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "使用全域設定值。"
-
-#: ../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 "在這個圖層的各點之間繪出線條。"
-
 #: ../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 "在這個圖層的各點之間不要繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1400
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
-msgid "Select line drawing options"
-msgstr "選擇線條繪製選項"
-
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../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
@@ -12364,10 +12344,10 @@
 msgstr "{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 "匯入音效"
 
-#: ../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
@@ -12380,6 +12360,6 @@
 "記，我們不能將它們與聲音資料關聯。</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
@@ -12387,10 +12367,10 @@
 msgstr "不可能匯入"
 
-#: ../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 "Wave 音效檔案 (*.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
@@ -12398,10 +12378,10 @@
 msgstr "{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 "匯入圖片"
 
-#: ../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
@@ -13185,5 +13165,5 @@
 msgstr "在顯示 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
@@ -13193,5 +13173,5 @@
 msgstr "警告：從「{0}」載入 Mappaint 樣式失敗。例外為：{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}''..."
@@ -14157,5 +14137,98 @@
 msgstr "顏色"
 
-#: ../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 "繪出方向箭頭"
+
+#. 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 "只在路徑的開頭。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgid "Draw oneway arrows."
+msgstr "繪出單行道箭頭。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+msgid "Draw segment order numbers"
+msgstr "繪製區段順序編號"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Draw boundaries of downloaded data"
+msgstr "繪出已下載資料的邊界"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw virtual nodes in select mode"
+msgstr "在選擇模式繪出虛擬節點"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw inactive layers in other color"
+msgstr "將未使用的圖層以其他顏色繪製"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+msgid "Smooth map graphics (antialiasing)"
+msgstr "平滑化地圖圖片（反鉅齒）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Draw only outlines of areas"
+msgstr "只繪出區域的輪廓"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+msgid "GPS Points"
+msgstr "GPS 點"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid "Draw direction hints for way segments."
+msgstr "繪出路徑區段的方向提示。"
+
+#. 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 "繪出單行道和其他有方向的物件的方向箭頭。"
+
+#. 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 "繪出所有區段在其路徑中的順序編號。"
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "繪出從伺服器下載資料的邊界。"
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
+
+#. 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 "將未使用的資料圖層以不同的顏色繪製。"
+
+#: ../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 "這個選項會防止填滿區域，並且會覆蓋在選取樣式中指定的任何數值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+msgid "OSM Data"
+msgstr "OSM 資料"
+
+#: ../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 "使用全域設定值。"
+
+#: ../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
@@ -14166,10 +14239,10 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../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
@@ -14178,30 +14251,35 @@
 msgstr "沒有"
 
-#: ../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 "如果沒有匯入區段時強制繪出的線條。"
 
-#: ../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 "繪出大型 GPS 點。"
 
-#: ../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 "從 HDOP 數值繪製圓形。"
 
-#: ../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 "速率（紅 = 慢，綠 = 快）"
 
-#: ../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 ""
 
-#: ../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 "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+msgid "Track date"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -14209,5 +14287,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"
@@ -14231,5 +14309,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
@@ -14272,5 +14350,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
@@ -14284,61 +14362,22 @@
 msgstr "步行"
 
-#: ../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 "繪出方向箭頭"
-
-#: ../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 "讀取 GPX 時建立標記。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
-#. 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 "只在路徑的開頭。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
-msgid "Draw oneway arrows."
-msgstr "繪出單行道箭頭。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
-msgid "Draw segment order numbers"
-msgstr "繪製區段順序編號"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
-msgid "Draw boundaries of downloaded data"
-msgstr "繪出已下載資料的邊界"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
-msgid "Draw virtual nodes in select mode"
-msgstr "在選擇模式繪出虛擬節點"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
-msgid "Draw inactive layers in other color"
-msgstr "將未使用的圖層以其他顏色繪製"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Smooth map graphics (antialiasing)"
-msgstr "平滑化地圖圖片（反鉅齒）"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
-msgid "Create markers when reading GPX."
-msgstr "讀取 GPX 時建立標記。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
-msgid "Draw only outlines of areas"
-msgstr "只繪出區域的輪廓"
-
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Auto"
 msgstr "自動"
 
 #. 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"
@@ -14346,14 +14385,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 "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
 msgid "Both"
 msgstr "兩者"
 
-#: ../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 "
@@ -14361,9 +14401,11 @@
 msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
 
-#: ../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 "在原始 GPS 點之間繪出線條"
 
-#: ../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 "
@@ -14371,35 +14413,35 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../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 "本地端檔案最大長度（公尺）"
 
-#: ../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."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../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 "最大長度（公尺）"
 
 #. 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."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../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 "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. 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 "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. 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 "
@@ -14407,13 +14449,14 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../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 "最小距離（像素）"
 
-#: ../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 "將 GPS 點以較大的點繪製。"
 
-#: ../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 "
@@ -14421,13 +14464,13 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../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 "依速度來為點和軌跡區段上色。"
 
-#: ../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 ""
 
-#: ../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 "
@@ -14435,63 +14478,28 @@
 msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置需要能記錄這項資訊。"
 
-#: ../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 ""
+
+#. 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 "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../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 "軌跡與點的顏色"
 
-#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
 msgid "Waypoint labelling"
 msgstr "航點標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
-msgid "GPS Points"
-msgstr "GPS 點"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
-msgid "Draw direction hints for way segments."
-msgstr "繪出路徑區段的方向提示。"
-
-#. 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 "繪出單行道和其他有方向的物件的方向箭頭。"
-
-#. 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 "繪出所有區段在其路徑中的順序編號。"
-
-#. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:274
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
-
-#. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
-msgid "Draw the boundaries of data loaded from the server."
-msgstr "繪出從伺服器下載資料的邊界。"
-
-#. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
-msgid "Draw virtual nodes in select mode for easy way modification."
-msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
-
-#. 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 "將未使用的資料圖層以不同的顏色繪製。"
-
-#: ../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 "這個選項會防止填滿區域，並且會覆蓋在選取樣式中指定的任何數值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
-msgid "OSM Data"
-msgstr "OSM 資料"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
+msgid "Global settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16314,25 +16322,25 @@
 msgstr ""
 
+#. 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."
+"Unexpected response from HTTP server. Got {0} response without ''Location'' "
+"header. Can''t redirect. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
-msgid "Fatal: too many redirects to the download URL detected. Aborting."
+msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
-#, fuzzy, java-format
+#, java-format
 msgid "Download redirected to ''{0}''"
-msgstr "從「{1}」下載 {0} 個物件"
+msgstr ""
 
 #: ../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 "警告：無法從「{0}」讀取 MOTD。例外為：{1}"
+#, java-format
+msgid "Failed to read from ''{0}''. Server responded with status code {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -18018,5 +18026,6 @@
 msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。"
 
-#: ../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 ""
@@ -18025,11 +18034,11 @@
 msgstr "嚴重的錯誤：無法定位圖片「{0}」。這是嚴重的組態問題。JOSM 會停止運作。"
 
-#: ../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}"
 msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{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 ""
@@ -35917,9 +35926,9 @@
 msgstr "顯示不完整的地址"
 
-#: ../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 "項目"
 
-#: ../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 "沒有項目"
@@ -36018,5 +36027,5 @@
 msgstr "選擇所有資料不完整的地址。"
 
-#: ../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 "圖層屬性"
@@ -36984,7 +36993,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
-#, fuzzy
 msgid "Allows an automatic caching"
-msgstr "啟用自動快取。"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -37080,7 +37088,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
-#, fuzzy
 msgid "Cancel current grab"
-msgstr "點選以取消目前的操作"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
@@ -37767,4 +37774,20 @@
 "軌跡，請看這裡："
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+msgid "Customize line drawing"
+msgstr "自訂線條的繪製"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+msgid "Draw lines between points for this layer."
+msgstr "在這個圖層的各點之間繪出線條。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+msgid "Do not draw lines between points for this layer."
+msgstr "在這個圖層的各點之間不要繪出線條。"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+msgid "Select line drawing options"
+msgstr "選擇線條繪製選項"
+
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
@@ -38379,12 +38402,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-#, fuzzy
 msgid "Hide this"
-msgstr "隱藏這個按鈕"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
-#, fuzzy
 msgid "Hide this&older"
-msgstr "隱藏這個按鈕"
+msgstr ""
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
@@ -38393,14 +38414,10 @@
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
-#, fuzzy
 msgid "km/h"
 msgstr ""
-"\n"
-"{0} 公里/小時"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
-#, fuzzy
 msgid "Track name: "
-msgstr "產業道路等級 3"
+msgstr ""
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39995,5 +40012,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}"
@@ -40001,5 +40018,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: "
@@ -42428,9 +42445,8 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
-#, fuzzy
 msgid ""
 "Please select at least two nodes for symmetry axis and something else to "
 "mirror."
-msgstr "請至少選擇兩個要合併的節點或是靠近另一個節點的節點。"
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44997,4 +45013,7 @@
 #~ msgstr "編輯產業道路等級 1"
 
+#~ msgid "Track Grade 3"
+#~ msgstr "產業道路等級 3"
+
 #~ msgid "Track Grade 1"
 #~ msgstr "產業道路等級 1"
