Changeset 26428 in osm for applications/editors/josm/i18n/po/en_GB.po

Timestamp:

2011-07-31T23:53:55+02:00 (13 years ago)

Author:

stoecker

Message:

josm i18n update

File:

• applications/editors/josm/i18n/po/en_GB.po (modified) (66 diffs)

applications/editors/josm/i18n/po/en_GB.po

@@ -11 +11 @@
 "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 +20 @@
 "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 +80 @@
 #: ../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 +164 @@
 #: ../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 +400 @@
 #: ../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 +1209 @@
 #: ../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 +1437 @@
 
 #: ../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 +2409 @@
 #.
 #: ../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 +7945 @@
 
 #: ../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 +9428 @@
 #: ../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 +12365 @@
 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 +12384 @@
 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 +12393 @@
 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 +12403 @@
 #. 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 +12413 @@
 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 +12431 @@
 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 +12441 @@
 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 +12451 @@
 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 +12465 @@
 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 +12478 @@
 "<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 +12492 @@
 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 +12503 @@
 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 +12509 @@
 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 +12516 @@
 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 +12522 @@
 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 +12529 @@
 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 +12560 @@
 "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 +12574 @@
 "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 +12583 @@
 "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 +12599 @@
 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 +12616 @@
 "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 +12623 @@
 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 +12634 @@
 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 +13442 @@
 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 +13451 @@
 "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 +14456 @@
 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 +14558 @@
 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 +14570 @@
 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 +14606 @@
 #. <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 +14628 @@
 #. 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 +14669 @@
 #. <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 +14681 @@
 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 +14704 @@
 
 #. 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 +14722 @@
 "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 +14736 @@
 "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 +14747 @@
 "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 +14758 @@
 "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 +14769 @@
 
 #. 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 +14777 @@
 "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 +14794 @@
 "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 +14810 @@
 "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 +16704 @@
 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 +18494 @@
 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 +18504 @@
 "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 +36423 @@
 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 +36524 @@
 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 +37461 @@
 
 #: ../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 +37560 @@
 
 #: ../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 +38249 @@
 "<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 +38877 @@
 
 #: ../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 +38889 @@
 
 #: ../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 +40490 @@
 
 #: ../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 +40496 @@
 
 #. 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 +42907 @@
 
 #: ../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 +44291 @@
 #~ 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 +44594 @@
 #~ msgid "Footway"
 #~ msgstr "Footway"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
 
 #~ msgid "Track Grade 2"