Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 26299)
+++ applications/editors/josm/i18n/po/fi.po	(revision 26375)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-10 22:18+0200\n"
-"PO-Revision-Date: 2011-07-05 17:39+0000\n"
-"Last-Translator: Tommi Rautava <Unknown>\n"
+"POT-Creation-Date: 2011-07-20 14:14+0200\n"
+"PO-Revision-Date: 2011-07-20 11:21+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "Language: fi\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-10 15:49+0000\n"
-"X-Generator: Launchpad (build 13376)\n"
+"X-Launchpad-Export-Date: 2011-07-20 11:56+0000\n"
+"X-Generator: Launchpad (build 13468)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:244
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
@@ -54,13 +54,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:72
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:134
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:263
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:269
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:444
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:447
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:453
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -72,16 +72,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:706
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 #: ../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:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:396
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:745
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -91,5 +90,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:182
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:179
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:199
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:213
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:388
@@ -152,8 +151,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:127
@@ -165,16 +164,16 @@
 #: ../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:1012
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1054
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:569
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:765
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:227
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,8 +200,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:58
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
@@ -253,6 +252,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:818
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:820
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:817
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:819
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61
 msgid "Java OpenStreetMap Editor"
@@ -289,5 +288,5 @@
 #. <button label="Info" hotkey="I">
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:32
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:534
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
@@ -393,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
@@ -400,19 +399,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:217
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:347
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
 #: ../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/GpxLayer.java:1350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
@@ -426,9 +423,9 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:58
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:64
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
@@ -439,4 +436,5 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490
@@ -473,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:640
 msgid "Merge"
 msgstr "Yhdistä"
@@ -530,5 +528,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1598
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1582
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:63
@@ -564,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:48
@@ -595,4 +593,5 @@
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:45
@@ -639,5 +638,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -886,8 +885,8 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:742
@@ -1079,5 +1078,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:58
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1096,6 +1095,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:693
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:694
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1444
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:524
 msgid "Duplicate"
@@ -1115,5 +1114,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:556
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:564
 #, java-format
 msgid "Layer: {0}"
@@ -1170,10 +1169,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:392
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:375
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:391
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
@@ -1215,17 +1214,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1350
+#: ../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/OsmDataLayer.java:356
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:188
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:122
 #: build/specialmessages.java:71
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:323
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
@@ -1455,5 +1452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 msgid "URL"
@@ -1519,9 +1516,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210
 msgid ""
-"Couldn't match the entered link or id to the selected service. Please try "
+"Couldn''t match the entered link or id to the selected service. Please try "
 "again."
 msgstr ""
-"Annettu linkki tai tunniste ei täsmää valitun palvelun kanssa. Yritä "
-"uudestaan."
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
@@ -1879,5 +1874,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1598
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1582
 msgid "Paste Tags"
 msgstr "Liitä tagit"
@@ -1910,5 +1905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:63
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
 msgid "Preferences"
@@ -2015,5 +2010,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:362
 #: build/specialmessages.java:78
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462
@@ -2026,5 +2021,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:361
 msgid "Save the current data."
 msgstr "Tallenna tämänhetkinen data."
@@ -2082,10 +2077,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:377
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:360
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:376
 msgid "Save the current data to a new file."
 msgstr "Tallenna data uuteen tiedostoon."
@@ -2128,8 +2123,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
@@ -2157,5 +2153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:263
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
 msgid "No, abort"
@@ -2225,14 +2221,14 @@
 msgstr[1] "Yksinkertaista polku (poista {0} pistettä)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:82
 msgid "Split Way"
 msgstr "Katkaise polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split a way at the selected node."
 msgstr "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
@@ -2240,10 +2236,10 @@
 "Nykyistä valintaa ei voida käyttää jakamiseen - pistettä ei ole valittu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:129
 msgid "The selected nodes do not share the same way."
 msgstr "Valitut pisteet eivät ole samalla polulla."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:104
 msgid "The selected node is not in the middle of any way."
@@ -2252,5 +2248,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:116
 msgid ""
@@ -2267,10 +2263,10 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:247
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:263
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:269
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -2280,5 +2276,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:443
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:446
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -2288,5 +2284,5 @@
 "<br>Sinun tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -2296,5 +2292,5 @@
 "tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:459
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2447,5 +2443,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
@@ -2842,4 +2838,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:56
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2978,5 +2975,5 @@
 msgstr "Pidä Ctrl-näppäin pohjassa vaihtaaksesi kiinnittymistilaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:542
 msgid ""
 "ParallelWayAction\n"
@@ -2984,5 +2981,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:544
 msgid "Make parallel way error"
 msgstr ""
@@ -3011,5 +3008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
@@ -3711,7 +3708,9 @@
 "conflict cannot be added.</html>"
 msgstr ""
+"<html>Tasolla \"{0}\" on jo konflikti objektille<br>\"{1}\".<br>Tätä "
+"konfliktia ei voida lisätä</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
 msgid "Double conflict"
 msgstr "Kaksinkertainen ristiriita"
@@ -3723,4 +3722,6 @@
 "object ''{1}''."
 msgstr ""
+"Varoitus: Tasoa \"{0}\" ei enää ole olemassa. Ei voida poistaa objektin "
+"\"{1}\" konfliktia."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
@@ -3913,6 +3914,6 @@
 msgid "Undelete {0} object"
 msgid_plural "Undelete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Palauta {0} objekti"
+msgstr[1] "Palauta {0} objektia"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
@@ -4050,15 +4051,15 @@
 msgstr "Virheellinen pituuspiiri ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:328
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:336
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:459
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
 #, java-format
 msgid ""
@@ -4069,5 +4070,5 @@
 "hakemisto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
 #, java-format
 msgid ""
@@ -4078,5 +4079,5 @@
 "hakemisto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
 #, java-format
 msgid ""
@@ -4087,5 +4088,5 @@
 "voitu luoda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:477
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
 #, java-format
 msgid ""
@@ -4096,5 +4097,5 @@
 "voitu luoda: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
 #, java-format
 msgid ""
@@ -4104,5 +4105,5 @@
 "asetustiedosto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:492
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
 #, java-format
 msgid ""
@@ -4113,5 +4114,5 @@
 "asetustiedostolla."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
 #, java-format
 msgid ""
@@ -4122,5 +4123,5 @@
 "palauttaa oletusarvoihin: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:513
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
 #, java-format
 msgid ""
@@ -4131,5 +4132,5 @@
 "<br> ja luodaan uusi oletusarvoinen asetustiedosto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:523
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
 #, java-format
 msgid ""
@@ -4140,5 +4141,5 @@
 "palauttaa oletusarvoihin: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:549
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
 #, java-format
 msgid "Paint style {0}: {1}"
@@ -4241,4 +4242,5 @@
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
 msgstr ""
+"Projektiota \"{0}\" ei löytynyt, kirjanmerkki \"{1}\" ei ole käytettävissä"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:186
@@ -4297,9 +4299,7 @@
 #, java-format
 msgid ""
-"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
-"the source dataset"
-msgstr ""
-"Kohde tyyppiä {0} tunnuksella {1} oli merkitty poistettavaksi, mutta se "
-"puuttuu lähdetiedoista"
+"Object of type {0} with id {1} was marked to be deleted, but it''s missing "
+"in the source dataset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247
@@ -4330,8 +4330,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316
 #, java-format
-msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-msgstr ""
-"Ristiriita 'visible' (näkyvä) attribuutissa kohteelle jonka tyyppi on {0} ja "
-"tunniste {1}"
+msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:118
@@ -4651,5 +4649,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Pohjoinen"
@@ -4720,5 +4718,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Test.java:100
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Check.java:92
 #, java-format
 msgid "Running test {0}"
@@ -4847,10 +4844,9 @@
 msgstr "Pisteet samassa paikassa"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:140
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:161
-msgid "Duplicated relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:141
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
+msgid "Duplicated relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:139
 msgid ""
 "This test checks that there are no relations with same tags and same members "
@@ -4858,9 +4854,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:170
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:159
+msgid "Duplicated relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:168
 msgid "Relations with same members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:252
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:251
 msgid "Delete duplicate relations"
 msgstr ""
@@ -4960,7 +4960,7 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:37
 msgid ""
-"This test finds multilingual objects whose 'name' attribute is not equal to "
-"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
-"Italia - Italien - Italy."
+"This test finds multilingual objects whose ''name'' attribute is not equal "
+"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
+"e.g., Italia - Italien - Italy."
 msgstr ""
 
@@ -5701,5 +5701,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:79
 msgid "Do not show again (remembers choice)"
 msgstr "Älä näytä uudestaan (muistaa valinnan)"
@@ -5852,5 +5852,5 @@
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:622
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:153
@@ -5968,10 +5968,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:171
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:179
 msgid "Password"
 msgstr "Salasana"
@@ -6257,10 +6257,10 @@
 msgstr "Käyttäjä:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:392
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:409
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:408
 msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:710
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:709
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -6541,5 +6541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:434
@@ -6557,5 +6557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -7106,5 +7106,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -7227,4 +7227,6 @@
 msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
+"Paikka {0} on sallittujen rajojen ulkopuolella. Nykyinen jäsenten määrä on "
+"{1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29
@@ -7420,5 +7422,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
@@ -7429,5 +7431,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:127
@@ -7476,5 +7478,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:101
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -7907,5 +7909,5 @@
 "W 19&deg; 24</li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 "
 "15.88</li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 "
-"deg 42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
+"deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
 msgstr ""
 
@@ -7923,76 +7925,76 @@
 msgstr "Sulje ikkuna luomatta uutta pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
 msgid "Delete the selected layers."
 msgstr "Poista valitut tasot."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1412
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
 msgid "Toggle visible state of the selected layer."
 msgstr "Näytä/piilota valittu taso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:474
 msgid "Opacity"
 msgstr "Läpinäkyvyys"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:486
 msgid "Adjust opacity of the layer."
 msgstr "Säädä tason läpinäkyvyyttä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
 msgid "Activate"
 msgstr "Aktivoi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
 msgid "Activate the selected layer"
 msgstr "Aktivoi valittu taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:645
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:646
 msgid "Merge this layer into another layer"
 msgstr "Yhdistä tämä taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:699
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:700
 msgid "Duplicate this layer"
 msgstr "Monista tämä taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:776
 msgid "layer is currently visible (click to hide layer)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:776
 msgid "layer is currently hidden (click to show layer)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:790
 msgid "this layer is the active layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:790
 msgid "this layer is not currently active (click to activate)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:903
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:924
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:40
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:41
 msgid "Information about layer"
 msgstr "Tietoja tasosta"
@@ -8130,5 +8132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:392
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
 msgid "Create a copy of this relation and open it in another editor window"
@@ -8240,8 +8242,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:500
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:56
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:58
 msgid "Selection"
 msgstr "Valinta"
@@ -8357,5 +8359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:84
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:83
 msgid "Zoom to problem"
 msgstr "Näytä ongelmakohta"
@@ -9526,5 +9528,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:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -10305,5 +10307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:475
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1177
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:615
 msgid "Conflict in data"
@@ -10370,26 +10372,26 @@
 msgstr "({0}/{1}): Ladataan relaatio ''{2}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:170
 msgid "Tags and Members"
 msgstr "Tagit ja jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:174
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:180
 msgid "Parent Relations"
 msgstr "Emorelaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:175
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
 msgid "Child Relations"
 msgstr "Lapsirelaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:313
 msgid "Apply Role:"
 msgstr "Aseta rooli:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315
 msgid "Enter a role and apply it to the selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:599
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -10401,14 +10403,14 @@
 "<br>Mitä syklisille riippuvuuksille tehdään?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
 msgid "Remove them, clean up relation"
 msgstr "Poista ne, siivoa relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
 msgid "Ignore them, leave relation as is"
 msgstr "Ei mitään, jätä relaatio silleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:685
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:669
 #, java-format
 msgid ""
@@ -10418,9 +10420,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:695
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:679
 msgid "Multiple members referring to same object."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
 #, java-format
 msgid ""
@@ -10432,13 +10434,13 @@
 "riippuvuuteen, jota on syytä välttää.<br>Ohitetaan relaatio ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:754
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:738
 msgid "Add all objects selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:791
 msgid ""
 "Add all objects selected in the current dataset before the first selected "
@@ -10446,5 +10448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:841
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:825
 msgid ""
 "Add all objects selected in the current dataset after the last selected "
@@ -10452,19 +10454,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
 msgid "Remove all members referring to one of the selected objects"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
 msgid "Relation Editor: Remove Selected"
 msgstr "Relaatiomuokkain: Poista valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Select relation members which refer to objects in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 #, java-format
 msgid ""
@@ -10472,14 +10474,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Select objects for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Sort the relation members"
 msgstr "Lajittele relaation jäsenet"
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:817
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:940
@@ -10488,52 +10490,52 @@
 msgstr "Järjestä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Relation Editor: Sort"
 msgstr "Relaatiomuokkain: Lajittele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
 msgid "Reverse the order of the relation members"
 msgstr "Käännä jäsenten järjestys ympäri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:973
 msgid "Reverse"
 msgstr "Käännä järjestys"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:974
 msgid "Relation Editor: Reverse"
 msgstr "Relaatiomuokkain: Käännä järjestys"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:994
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:997
 msgid "Relation Editor: Move Up"
 msgstr "Relaatiomuokkain: Siirrä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1016
 msgid "Relation Editor: Move Down"
 msgstr "Relaatiomuokkain: Siirrä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
 msgid "Remove the currently selected members from this relation"
 msgstr "Poista valitut jäsenet tästä relaatiosta"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
 msgid "Relation Editor: Remove"
 msgstr "Relaatiomuokkain: Poista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
 msgid "Delete the currently edited relation"
 msgstr "Poista relaatio, jota ollaan muokkaamassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -10545,23 +10547,23 @@
 "muokattiin. Ne on poistettu relaation jäsenluettelosta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1158
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:596
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1160
 msgid "Click to create a conflict and close this relation editor"
 msgstr "Luo ristiriita ja sulje relaatiomuokkain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:602
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "Palaa muokkaimeen jatkamaan relaation muokkaamista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1173
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -10573,5 +10575,5 @@
 "suljetaan muokkain?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628
 #, java-format
@@ -10581,50 +10583,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:642
 msgid "Apply the current updates"
 msgstr "Tee muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:685
 msgid "Apply the updates and close the dialog"
 msgstr "Tee muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:739
 msgid "Cancel the updates and close the dialog"
 msgstr "Peruuta muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
 msgid "Download all incomplete members"
 msgstr "Lataa kaikki keskeneräiset jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335
 msgid "Relation Editor: Download Members"
 msgstr "Relaatiomuokkain: Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1332
 msgid "Download selected incomplete members"
 msgstr "Lataa valitut keskeneräiset jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Sets a role for the selected members"
 msgstr "Aseta rooli valituille jäsenille"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
 msgid "Apply Role"
 msgstr "Aseta rooli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
 #, java-format
 msgid "You are setting an empty role on {0} object."
@@ -10633,29 +10635,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1385
 msgid "This is equal to deleting the roles of these objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 msgid "Do you really want to apply the new role?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1405
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1406
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390
 msgid "No, do not apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1464
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Muokkaa relaatiota, johon valittu relaatiojäsen viittaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1557
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1541
 msgid ""
 "Members from paste buffer cannot be added because they are not included in "
@@ -10663,5 +10665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388
@@ -10669,14 +10671,14 @@
 msgstr "Näytä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to the object the first selected member refers to"
 msgstr "Näytä kohde, johon ensimmäinen valittu jäsen viittaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Ei voida näyttää, koska relaation sisältävä taso ei ole aktiivinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Ei voida näytää, koska yhtään jäsentä ei ole valittu"
@@ -11125,4 +11127,5 @@
 #. putValue(NAME, tr("Back"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:449
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:482
 msgid "Go to the previous page"
 msgstr ""
@@ -11553,5 +11556,5 @@
 msgstr "Muutoskokoelmaa {0} suljetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:102
 msgid ""
 "Warning: failed to put Credential Dialog always on top. Caught security "
@@ -11559,25 +11562,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:108
 msgid "Enter credentials for OSM API"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:115
 msgid "Enter credentials for HTTP proxy"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:149
-msgid "Save user and password (unencrypted)"
-msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:244
 msgid "Please enter the user name of your OSM account"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the password of your OSM account"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
 #, java-format
 msgid ""
@@ -11586,17 +11585,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:249
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:262
 msgid "Please enter the user name for authenticating at your proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the password for authenticating at your proxy server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
 #, java-format
 msgid ""
@@ -11605,5 +11604,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:267
 msgid ""
 "Warning: depending on the authentication method the proxy server uses the "
@@ -11611,13 +11610,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
 msgid "Authenticate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate with the supplied username and password"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 msgid "Cancel authentication"
 msgstr ""
@@ -12364,6 +12363,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+msgid "Customize Color"
+msgstr "Muokkaa väriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:66
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+msgid "Default"
+msgstr "Oletusarvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:70
+#: ../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
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
@@ -12373,6 +12387,6 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
+#: ../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/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
@@ -12382,5 +12396,5 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
 #, java-format
@@ -12392,5 +12406,5 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
@@ -12402,16 +12416,16 @@
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:274
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
@@ -12420,6 +12434,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
@@ -12430,6 +12444,6 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
@@ -12440,12 +12454,11 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:240
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
 #, java-format
@@ -12455,12 +12468,10 @@
 msgstr[1] "{0} jälkeä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:733
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:742
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12470,13 +12481,11 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:744
 #: ../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:725
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:767
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
@@ -12486,7 +12495,7 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:909
+#: ../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
 #: ../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
@@ -12497,5 +12506,5 @@
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
@@ -12503,5 +12512,5 @@
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
@@ -12510,5 +12519,5 @@
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
@@ -12516,5 +12525,5 @@
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
@@ -12523,25 +12532,25 @@
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
@@ -12552,10 +12561,10 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053
 #: ../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:1172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
 msgid ""
@@ -12564,5 +12573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1179
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1221
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
 msgid ""
@@ -12571,61 +12580,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../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:1307
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../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:1308
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../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:1309
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+#: ../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:1323
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+#: ../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:1343
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
-msgid "Customize Color"
-msgstr "Muokkaa väriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
-msgid "Default"
-msgstr "Oletusarvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1354
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:419
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
-msgid "Choose a color"
-msgstr "Valitse väri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1423
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1439
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
 #, java-format
@@ -12633,10 +12616,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1406
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1451
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1411
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1456
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
 #, java-format
@@ -12647,6 +12630,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1418
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1508
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1463
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1553
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
@@ -12654,10 +12637,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1442
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1487
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1477
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1522
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
 #, java-format
@@ -12665,10 +12648,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1496
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1541
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1501
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1546
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
 #, java-format
@@ -12692,9 +12675,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:350
 msgid "All projections are supported"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:409
 #, java-format
 msgid ""
@@ -12773,38 +12756,4 @@
 msgstr "Löytyneet virheet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-msgctxt "gps"
-msgid "track"
-msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-msgid "point"
-msgid_plural "points"
-msgstr[0] "piste"
-msgstr[1] "pisteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
-#, java-format
-msgid "a track with {0} point"
-msgid_plural "a track with {0} points"
-msgstr[0] "jälki, jossa on {0} piste"
-msgstr[1] "jälki, jossa on {0} pistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-#, java-format
-msgid "{0} consists of {1} track"
-msgid_plural "{0} consists of {1} tracks"
-msgstr[0] "{0}:ssä on {1} jälki"
-msgstr[1] "{0}:ssä on {1} jälkeä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
-#, java-format
-msgid "{0} point"
-msgid_plural "{0} points"
-msgstr[0] "{0} piste"
-msgstr[1] "{0} pistettä"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
 #, java-format
@@ -12880,24 +12829,24 @@
 msgstr "Ei virheitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:153
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:155
 msgid "(deactivated)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:208
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:211
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:213
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:254
 #, java-format
 msgid ""
@@ -12908,17 +12857,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:262
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:564
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:568
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:571
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12927,58 +12876,58 @@
 "resoluutiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:580
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:629
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:632
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:650
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:653
 msgid "Alpha channel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:686
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:689
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:727
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:730
 msgid "File Format Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:764
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:767
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:778
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:789
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:824
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827
 msgid "Zoom to native resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:943
 #, java-format
 msgid "Supported projections are: {0}"
@@ -13033,18 +12982,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:373
 msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:431
 msgid ""
 "Error while parsing the date.\n"
@@ -13054,93 +13003,93 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:433
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:482
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:491
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:539
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:542
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:548
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:584
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:701
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:686
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:827
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:832
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -13150,20 +13099,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:933
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -13172,5 +13121,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:960
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -13178,21 +13127,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:962
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:998
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:999
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1027
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -13201,17 +13150,17 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1028
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1123
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1124
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1316
 #, java-format
 msgid ""
@@ -13220,5 +13169,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1386
 #, java-format
 msgid ""
@@ -13227,52 +13176,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:102
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:115
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:267
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:269
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:310
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} image loaded."
@@ -13281,5 +13230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -13288,10 +13237,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:667
 #, java-format
 msgid ""
@@ -13300,19 +13249,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:692
 msgid "Image file could not be deleted."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:429
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:479
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:489
 #, java-format
 msgid "Loading {0}"
 msgstr "Ladataan {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:468
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:491
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:518
 #, java-format
 msgid "Error on file {0}"
@@ -13350,4 +13299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:497
 msgid "Next"
 msgstr "Seuraava"
@@ -13398,9 +13348,10 @@
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
 msgid "marker"
 msgid_plural "markers"
@@ -13408,5 +13359,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13415,26 +13366,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Näytä/piilota merkintöjen tekstit ja kuvakkeet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13442,14 +13393,14 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:480
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13636,5 +13587,5 @@
 "strong> be saved in clear text in the JOSM preferences and it will be "
 "submitted to the OSM server <strong>only once</strong>. Subsequent data "
-"upload requests don't use your password any more."
+"upload requests don''t use your password any more."
 msgstr ""
 
@@ -13687,4 +13638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:359
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:480
 msgid "Back"
 msgstr "Takaisin"
@@ -14137,5 +14089,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
 msgid ""
-"That layer does not support any of JOSM's projections,\n"
+"That layer does not support any of JOSM''s projections,\n"
 "so you can not use it. This message will not show again."
 msgstr ""
@@ -14145,5 +14097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:297
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:319
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:338
 msgid "WMS Error"
 msgstr ""
@@ -14185,5 +14137,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:336
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337
 msgid "Could not retrieve WMS layer list."
 msgstr ""
@@ -14428,5 +14380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
@@ -14444,5 +14396,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
@@ -14552,5 +14504,5 @@
 #. 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:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
@@ -14589,11 +14541,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
+msgid "Dynamic color range based on data limits"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
 msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
-msgctxt "gpx_field"
-msgid "Name"
 msgstr ""
 
@@ -14601,12 +14551,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
 msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+msgctxt "gpx_field"
 msgid "Desc(ription)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:75
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14614,9 +14570,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14626,9 +14582,9 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14637,20 +14593,21 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:126
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:223
 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:147
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14658,5 +14615,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14664,13 +14621,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:167
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:204
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14680,13 +14637,13 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:205
 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:199
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:206
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14694,50 +14651,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:205
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
 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:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:217
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
-msgid "Allows to change the labelling of track waypoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:228
+#: ../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:243
+#: ../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:254
+#: ../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:259
+#: ../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:264
+#: ../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:269
+#: ../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:274
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14745,9 +14698,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:279
+#: ../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:285
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:295
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14755,5 +14708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:291
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:301
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -15278,9 +15231,9 @@
 msgstr "Muuttujaryhmät"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106
 msgid "Close the preferences dialog and discard preference updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:124
 msgid "Save the preferences and close the dialog"
 msgstr ""
@@ -15892,23 +15845,10 @@
 msgstr "OSM-salasana:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
-msgid ""
-"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
-"is stored in plain text in the JOSM preferences file. Furthermore, it is "
-"transferred <strong>unencrypted</strong> in every request sent to the OSM "
-"server. <strong>Do not use a valuable password.</strong></p></body></html>"
-msgstr ""
-"<html><body><p class=\"warning-body\"><strong>Varoitus:</strong> Salasana "
-"tallennetaan salaamattomana JOSMin asetustiedostoon. Myös tunnistautuminen "
-"tietoja lähetettäessä, kuten kaikki tietoliikenne OSM:n palvelimelle, on "
-"<strong>salaamatonta</strong>. <strong>Älä käytä tätä salasanaa muualla.</"
-"strong></p></body></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:106
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:147
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:178
@@ -15917,5 +15857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:128
 msgid "Warning: failed to save OSM credentials to credential manager."
 msgstr ""
@@ -16044,5 +15984,5 @@
 msgstr "Käytä SOCKS-välityspalvelinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:316
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:318
 msgid ""
 "Warning: JOSM is configured to use proxies from the system setting, but the "
@@ -16481,5 +16421,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:35
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:40
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:89
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:74
@@ -16540,10 +16480,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:80
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:82
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:126
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:128
 #, java-format
 msgid ""
@@ -16552,10 +16492,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:240
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:244
 #, java-format
 msgid "Failed to rename file {0} to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:245
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:249
 #, java-format
 msgid "Failed to load {0}, use cached file and retry next time: {1}"
@@ -16626,38 +16566,38 @@
 msgstr[1] "Ladataan {0} kohde palvelimelta ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:23
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:24
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183 -tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:58
 #, java-format
 msgid "Coordinates imported: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:59
 #, java-format
 msgid "Malformed sentences: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:60
 #, java-format
 msgid "Checksum errors: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:50
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:62
 #, java-format
 msgid "Unknown sentences: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:52
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:64
 #, java-format
 msgid "Zero coordinates: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:58
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:70
 msgid "NMEA import success"
 msgstr "NMEA-tuonti onnistui"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:64
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:76
 msgid "NMEA import failure!"
 msgstr "NMEA-tuonti epäonnistui"
@@ -17391,4 +17331,21 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java:117
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Varoitus:</strong> Salasana "
+"tallennetaan salaamattomana JOSMin asetustiedostoon. Myös tunnistautuminen "
+"tietoja lähetettäessä, kuten kaikki tietoliikenne OSM:n palvelimelle, on "
+"<strong>salaamatonta</strong>. <strong>Älä käytä tätä salasanaa muualla.</"
+"strong></p></body></html>"
+
+#: ../core/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java:131
+msgid "Save user and password (unencrypted)"
+msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17406,12 +17363,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:127
-#, java-format
-msgid ""
-"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
-"or a trailing '?'."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:128
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:147
+#, java-format
+msgid ""
+"Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing "
+"''&'' or a trailing ''?''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:148
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -17419,10 +17376,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:129
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:176
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:196
 #, java-format
 msgid ""
@@ -18206,5 +18163,5 @@
 msgstr "Käännöstä ei löydy: {0}. Käytetään oletusasetusta: {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:93
 #, java-format
 msgid ""
@@ -18213,11 +18170,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:197
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:279
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:257
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:336
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:350
 #, java-format
 msgid ""
@@ -18793,5 +18750,5 @@
 "them. Just change the colors and create a new scheme. Used to switch to a "
 "white background with matching colors for better visibility in bright "
-"sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but "
+"sunlight. See dialog in preferences and ''Map Settings'' (strange but "
 "true :-)"
 msgstr ""
@@ -18920,6 +18877,6 @@
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
-"made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-"the filename of an image."
+"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
+"matches the filename of an image."
 msgstr ""
 
@@ -18942,11 +18899,18 @@
 msgstr ""
 
+#. Plugin InfoMode
+#: build/trans_plugins.java:63
+msgid ""
+"Extra information about current layer objects pop ups - currently GPX "
+"trackpoint info"
+msgstr ""
+
 #. Plugin irsrectify
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin junctionchecking
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
@@ -18955,10 +18919,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin licensechange
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "Checks if all users contributing to an object have agreed to the license "
@@ -18967,5 +18931,5 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -18973,5 +18937,5 @@
 
 #. Plugin mapdust
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on       the map. You can "
@@ -18981,5 +18945,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -18989,20 +18953,27 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin namemanager
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
+#. Plugin native_password_manager
+#: build/trans_plugins.java:85
+msgid ""
+"Use your system''s password manager to store the API username and password. "
+"(KWallet and gnome-keyring are supported.)"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:87
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -19012,15 +18983,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:89
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:91
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:93
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -19028,5 +18999,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:95
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -19034,10 +19005,10 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:97
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:99
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -19046,5 +19017,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:101
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -19053,15 +19024,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:103
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin proj4j
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:105
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:107
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -19069,25 +19040,25 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:109
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:111
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr "Lisää &quot;Uudelleenkäynnistä JOSM&quot;-valinnan Tiedosto-valikkoon."
 
 #. Plugin reverter
-#: build/trans_plugins.java:109
+#: build/trans_plugins.java:113
 msgid "Plugin for reverting changesets"
 msgstr "Liitännäinen muutoskokoelmien muutosten palauttamiseen ennalleen"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:115
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:117
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -19097,5 +19068,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:119
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -19104,10 +19075,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:121
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:123
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -19117,20 +19088,20 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:121 build/trans_plugins.java:123
+#: build/trans_plugins.java:125 build/trans_plugins.java:127
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:129
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:131
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:133
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19140,15 +19111,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:135
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:137
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:139
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -19157,5 +19128,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:141
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19164,10 +19135,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:143
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:145
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -19175,5 +19146,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:147
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19182,15 +19153,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:149
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:151
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:153
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19200,5 +19171,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:155
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19207,20 +19178,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:157
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:159
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:161
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:163
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -27161,4 +27132,5 @@
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
+msgctxt "color"
 msgid "black"
 msgstr ""
@@ -27166,96 +27138,35 @@
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
+msgctxt "color"
 msgid "brown"
-msgstr ""
-
-#. item "Facilities/Bench" combo "Colour" display value
-#. item "Facilities/Fire Hydrant" combo "Position" display value
-#. </rule>
-#.
-#. <!--landuse tags -->
-#.
-#. <rule>
-#. <condition k="landuse" v="farm"/>
-#. color green
-#. <icon annotate="true" src="misc/landmark/farm.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="farmland"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="meadow"/>
-#. color green
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="vineyard"/>
-#. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="orchard"/>
-#. color green
-#. <icon src="misc/landmark/trees.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="allotments"/>
-#. color green
-#. <icon src="misc/landmark/plant.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="greenhouse_horticulture"/>
-#. color green
-#. <icon src="misc/landuse/greenhouse_horticulture.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="grass"/>
-#. color green
-#. <icon src="rendering/landuse/cemetery.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="village_green"/>
-#. color green
-#. <icon src="leisure/common.png"/>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="recreation_ground"/>
-#. color green
-#: build/trans_presets.java:2550 build/trans_presets.java:2588
-#: build/trans_style.java:2671 build/trans_style.java:2677
-#: build/trans_style.java:2683 build/trans_style.java:2689
-#: build/trans_style.java:2695 build/trans_style.java:2730
-#: build/trans_style.java:2736 build/trans_style.java:2742
-#: build/trans_style.java:2822 build/trans_style.java:2828
-msgid "green"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
-msgid "red"
+msgctxt "color"
+msgid "green"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
-msgid "blue"
+msgctxt "color"
+msgid "red"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
-msgid "gray"
+msgctxt "color"
+msgid "blue"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
 #: build/trans_presets.java:2550
+msgctxt "color"
+msgid "gray"
+msgstr ""
+
+#. item "Facilities/Bench" combo "Colour" display value
+#: build/trans_presets.java:2550
+msgctxt "color"
 msgid "white"
 msgstr ""
@@ -27319,4 +27230,5 @@
 #. item "Facilities/Hunting Stand" combo "Height" display value
 #: build/trans_presets.java:2563
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
 msgstr ""
@@ -27399,4 +27311,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position" display value
 #: build/trans_presets.java:2588
+msgctxt "hydrant position"
 msgid "lane"
 msgstr ""
@@ -27404,4 +27317,5 @@
 #. item "Facilities/Fire Hydrant" combo "Position" display value
 #: build/trans_presets.java:2588
+msgctxt "hydrant position"
 msgid "parking_lot"
 msgstr ""
@@ -27409,5 +27323,12 @@
 #. item "Facilities/Fire Hydrant" combo "Position" display value
 #: build/trans_presets.java:2588
+msgctxt "hydrant position"
 msgid "sidewalk"
+msgstr ""
+
+#. item "Facilities/Fire Hydrant" combo "Position" display value
+#: build/trans_presets.java:2588
+msgctxt "hydrant position"
+msgid "green"
 msgstr ""
 
@@ -34474,4 +34395,73 @@
 #. </rule>
 #.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
+#. color green
+#. <icon src="misc/landmark/trees.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="greenhouse_horticulture"/>
+#. color green
+#. <icon src="misc/landuse/greenhouse_horticulture.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color green
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#. color green
+#: build/trans_style.java:2671 build/trans_style.java:2677
+#: build/trans_style.java:2683 build/trans_style.java:2689
+#: build/trans_style.java:2695 build/trans_style.java:2730
+#: build/trans_style.java:2736 build/trans_style.java:2742
+#: build/trans_style.java:2822 build/trans_style.java:2828
+msgid "green"
+msgstr ""
+
+#. </rule>
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -35260,5 +35250,5 @@
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr "'footway' tagin 'foot' kanssa"
+msgstr "''footway'' tagin ''foot'' kanssa"
 
 #. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
@@ -35400,121 +35390,126 @@
 msgstr ""
 
+#. wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&
+#: build/trans_wms.java:20
+msgid "Bayern (2m)"
+msgstr ""
+
 #. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
-#: build/trans_wms.java:20
+#: build/trans_wms.java:21
 msgid "Geoimage.at"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:21
+#: build/trans_wms.java:22
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "NPE Maps"
 msgstr "NPE-kartat"
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kartat (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:27
+#: build/trans_wms.java:28
 msgid "7th Series (OS7)"
 msgstr "Ordnance Survey 7th Series (50-60 -luvun kartat Briteistä)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
-#. tms:http://tile.openstreetmap.dk/fugro2005
-#: build/trans_wms.java:40
+#. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
+#: build/trans_wms.java:41
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Tanska)"
 
-#. tms:http://tile.openstreetmap.dk/stevns/2009
-#: build/trans_wms.java:41
+#. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
+#: build/trans_wms.java:42
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Tanska)"
 
 #. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:43
+#: build/trans_wms.java:44
 msgid "ScanEx IRS"
 msgstr ""
@@ -35849,5 +35844,6 @@
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:118
-msgid "Elevation profile for track '"
+#, java-format
+msgid "Elevation profile for track ''{0}''."
 msgstr ""
 
@@ -35860,5 +35856,5 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:48
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
 msgid "Can not save preferences"
 msgstr ""
@@ -35876,13 +35872,17 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:57
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:31
+msgid "Max points count per 1 km"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:63
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:76
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
 msgid "Can not read settings"
 msgstr ""
@@ -35913,17 +35913,15 @@
 msgstr ""
 
-#. I18N: Eps = Epsilon, the tolerance parameter
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:367
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
-#, java-format
-msgid "Eps={0}, {1} points"
-msgstr ""
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:445
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:464
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
 msgid "Draw the way by mouse"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#, java-format
+msgid "Eps={0}, {1} points, {2} p/km"
 msgstr ""
 
@@ -36470,21 +36468,15 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
-msgid ""
-"<html>\n"
-"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-"italic;\">\n"
-"<span style=\"font-size: large;\">Welcome to the</span><br>\n"
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:55
+msgid ""
+"Welcome to the</span><br>\n"
 "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
 "85, 0);\">S</span> Plugin<br>\n"
 "</span><span style=\"font-size: medium;\"><br>\n"
 "...or it rather should be called <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-"span>\n"
-"</div>\n"
-"</html>"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:82
 msgid ""
 "<html>\n"
@@ -36501,5 +36493,5 @@
 
 #. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:86
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:89
 msgid ""
 "<html>\n"
@@ -36517,5 +36509,5 @@
 
 #. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:90
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:93
 msgid ""
 "<html>\n"
@@ -36535,5 +36527,5 @@
 
 #. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:94
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:97
 msgid ""
 "<html>\n"
@@ -36553,13 +36545,21 @@
 
 #. NOI18N
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+#, java-format
 msgid ""
 "<html>\n"
 "<div style=\"font-family:sans-serif\">\n"
 "<ul>\n"
-"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">{0}"
+"</span></i></b>. Alternatively you''ll find the command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:106
 msgid ""
 "<html>\n"
@@ -36573,5 +36573,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:137
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:140
 msgid "Don''t show this again"
 msgstr ""
@@ -36845,7 +36845,31 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
-msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
+msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
 "Älä käytä relaatiota osoitteille (vaan lisää kohteisiin \"addr:street\")."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
+msgid "off"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+msgid "25 m"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
+msgid "50 m"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
+msgid "100 m"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
+msgid "high"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+msgid "medium"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
@@ -37028,5 +37052,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294
 msgid ""
-"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
+"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
 
@@ -37129,16 +37153,20 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
+msgid "Cadastre grab"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:96
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:97
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -37147,13 +37175,17 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:34
+msgid "Georeference an image"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:56
 msgid "Grab non-georeferenced image"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:80
 msgid "Georeferencing interrupted"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:115
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116
 msgid ""
 "This image contains georeference data.\n"
@@ -37161,5 +37193,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
 msgid ""
 "Click first corner for image cropping\n"
@@ -37167,14 +37199,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:207
+msgid "Image cropping"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:206
-msgid "Image cropping"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:205
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:225
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -37182,14 +37214,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+msgid "Image georeferencing"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
-msgid "Image georeferencing"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:244
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:275
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:276
 msgid ""
 "Do you want to cancel completely\n"
@@ -37197,35 +37229,39 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:292
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:293
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:294
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:295
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:296
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:309
 msgid "I use the mouse"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:318
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:319
 #, java-format
 msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22
+msgid "Load layer from cache"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:25
 msgid "Load location from cache (only if cache is enabled)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:45
 #, java-format
 msgid "{0} not allowed with the current projection"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:58
 #, java-format
 msgid ""
@@ -37233,5 +37269,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #, java-format
 msgid ""
@@ -37239,5 +37275,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
@@ -37838,5 +37874,5 @@
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:95
-msgid "Condition isn't finished at </condition> tag"
+msgid "Condition isn''t finished at </condition> tag"
 msgstr ""
 
@@ -37954,5 +37990,6 @@
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
-msgid "Couldn't find built-in ruleset {0}"
+#, java-format
+msgid "Couldn''t find built-in ruleset {0}"
 msgstr ""
 
@@ -38221,5 +38258,5 @@
 "Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
 "\"mi\" or without unit.\n"
-"Alternatively, the format FEET' INCHES\" can be used."
+"Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
 
@@ -38242,5 +38279,5 @@
 msgid ""
 "Surface values must not contain any of the following characters: '','', "
-"''{'',  ''}'', ''='', ''|''"
+"'''{''',  '''}''', ''='', ''|''"
 msgstr ""
 
@@ -38371,4 +38408,14 @@
 msgstr ""
 
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:54
+#, fuzzy
+msgid "InfoMode"
+msgstr "Tietoja"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:54
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:56
+msgid "GPX info mode"
+msgstr ""
+
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
 msgid ""
@@ -38515,5 +38562,6 @@
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java:55
-msgid "Number of {0]-ways junctions found: "
+#, java-format
+msgid "Number of {0}-ways junctions found: {1}"
 msgstr ""
 
@@ -38523,5 +38571,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
-msgid "Direction index '{0}' not found"
+#, java-format
+msgid "Direction index ''{0}'' not found"
 msgstr ""
 
@@ -38805,18 +38854,24 @@
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:101
-msgid "Loading from Quick History Service"
-msgstr ""
-
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:145
-msgid "Analyzing"
-msgstr ""
-
+#, fuzzy
+msgid "Loading"
+msgstr "Ladataan {0}"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:142
+msgid "Loading from Quick History Service..."
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:146
+#, fuzzy
+msgid "Analyzing..."
+msgstr "Ladataan..."
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:103
 msgid "Relicensing problems"
 msgstr ""
 
-#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
 msgid "Open the relicensing window."
 msgstr ""
@@ -38836,5 +38891,5 @@
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
-msgid "license validation error"
+msgid "license check error"
 msgstr ""
 
@@ -38845,5 +38900,5 @@
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
-msgid "license validation warning"
+msgid "license check warning"
 msgstr ""
 
@@ -38854,5 +38909,5 @@
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
-msgid "license validation other"
+msgid "license check notice"
 msgstr ""
 
@@ -39045,4 +39100,141 @@
 msgstr ""
 
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68
+msgid "Native password manager plugin"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
+msgid "No native password manager could be found!"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
+msgid ""
+"Depending on your Operating Stystem / Distribution, you may have to create a "
+"default keyring / wallet first."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
+msgid "No thanks, use JOSM''s plain text preferences storage"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
+msgid ""
+"Found sensitive data that is still saved in JOSM''s preference file (plain "
+"text)."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
+msgid "Erase and transfer to password manager"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
+msgid "No, just keep it"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
+msgid "Close the dialog and discard all changes"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
+msgid "Proceed and go to the next page"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
+msgid "Finish"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
+msgid "Confirm the setup and close this dialog"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
+msgid "JOSM/OSM API/Username"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
+msgid "JOSM/OSM API/Password"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
+msgid "JOSM/Proxy/Username"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
+msgid "JOSM/Proxy/Password"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
+msgid "JOSM/OAuth/OSM API/Key"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
+msgid "JOSM/OAuth/OSM API/Secret"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
+msgid "Native Password Manager Plugin"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
+#, java-format
+msgid "The username and password is protected by {0}."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
+msgid "username"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
+msgid "password"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
+msgid "proxy username"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
+msgid "proxy password"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
+msgid "oauth key"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
+msgid "oauth secret"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
+#, java-format
+msgid ""
+"<br><strong>Warning:</strong> There may be sensitive data left in your "
+"preference file. ({0})"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242
+#, java-format
+msgid "Save user and password ({0})"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:16
+msgid "Plain text, JOSM default"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:22
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:28
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:33
+#, java-format
+msgid "Use {0}"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38
+msgid "Encrypt data with Windows logon credentials"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:42
+#, java-format
+msgid "The native password manager plugin detected {0} on your system."
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
 msgid "OpenStreetBugs download loop"
@@ -39083,5 +39275,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
-msgid "Couldn't create new bug. Result: {0}"
+#, java-format
+msgid "Couldn''t create new bug. Result: {0}"
 msgstr "Uutta ohjelmavirhettä ei voida luoda. Tulos: {0}"
 
@@ -39998,5 +40191,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:641
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:112
-msgid "Can't parse a time from this string."
+msgid "Can''t parse a time from this string."
 msgstr ""
 
@@ -40181,5 +40374,5 @@
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:58
 msgid ""
-"The GPX file doesn't contain valid trackpoints. Please use a GPX file that "
+"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
 "has trackpoints."
 msgstr ""
@@ -40311,7 +40504,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:78
-#, fuzzy
 msgid "Move tags from ways to relation"
-msgstr "Tageja relaatioista"
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:327
@@ -40344,7 +40536,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
-#, fuzzy
 msgid "Duplicate relation"
-msgstr "Poista suhteet"
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java:25
@@ -40680,5 +40871,6 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
-msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
+#, java-format
+msgid "Duplicate hotkey for button ''{0}'' - button will be ignored!"
 msgstr ""
 
@@ -41178,5 +41370,5 @@
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:190
-msgid "Don't ask again for the key"
+msgid "Don''t ask again for the key"
 msgstr ""
 
@@ -41721,5 +41913,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:265
-msgid "Insert 'via' objects from the clipboard"
+msgid "Insert ''via'' objects from the clipboard"
 msgstr ""
 
@@ -42169,4 +42361,23 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:33
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:46
+msgid "Extract node"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:34
+msgid "Extracts node from a way"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:45
+msgid ""
+"This tool extracts node from its ways and requires single node to be "
+"selected."
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:67
+msgid "Extract node from line"
+msgstr ""
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
@@ -42212,5 +42423,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:43
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:44
 msgid "More tools"
 msgstr "Lisää työkaluja"
@@ -42739,4 +42950,14 @@
 #~ msgstr "nimi"
 
+#~ msgid "point"
+#~ msgid_plural "points"
+#~ msgstr[0] "piste"
+#~ msgstr[1] "pisteet"
+
+#~ msgid "{0} point"
+#~ msgid_plural "{0} points"
+#~ msgstr[0] "{0} piste"
+#~ msgstr[1] "{0} pistettä"
+
 #~ msgid "image"
 #~ msgid_plural "images"
@@ -42789,7 +43010,4 @@
 #~ msgstr "Sähköpostiosoite"
 
-#~ msgid "Downloading..."
-#~ msgstr "Ladataan..."
-
 #~ msgid "Unknown file extension."
 #~ msgstr "Tuntematon tiedostopääte."
@@ -42836,4 +43054,9 @@
 #~ msgid "Merging conflicts."
 #~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "{0} consists of {1} track"
+#~ msgid_plural "{0} consists of {1} tracks"
+#~ msgstr[0] "{0}:ssä on {1} jälki"
+#~ msgstr[1] "{0}:ssä on {1} jälkeä"
 
 #~ msgid "Length: "
@@ -43181,4 +43404,9 @@
 #~ msgid "Delete the selected layer."
 #~ msgstr "Poista valittu taso."
+
+#~ msgid "a track with {0} point"
+#~ msgid_plural "a track with {0} points"
+#~ msgstr[0] "jälki, jossa on {0} piste"
+#~ msgstr[1] "jälki, jossa on {0} pistettä"
 
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
@@ -43418,4 +43646,7 @@
 #~ msgid "No data imported."
 #~ msgstr "Dataa ei tuotu."
+
+#~ msgid "Couldn't create new bug. Result: {0}"
+#~ msgstr "Uutta ohjelmavirhettä ei voida luoda. Tulos: {0}"
 
 #~ msgid "Really mark this issue as ''done''?"
@@ -44091,4 +44322,12 @@
 #~ msgstr "Lataa viittaavat objektit..."
 
+#~ msgctxt "gps"
+#~ msgid "track"
+#~ msgid_plural ""
+#~ "_: gps\n"
+#~ "tracks"
+#~ msgstr[0] "jälki"
+#~ msgstr[1] "jäljet"
+
 #~ msgid "GPX Track loaded"
 #~ msgstr "GPX-jälki ladattu"
@@ -44669,7 +44908,19 @@
 #~ "historiasivuile. Sovellusrajapinnan URL-perusosoite on \"{0}\""
 
+#~ msgid ""
+#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
+#~ "in the source dataset"
+#~ msgstr ""
+#~ "Kohde tyyppiä {0} tunnuksella {1} oli merkitty poistettavaksi, mutta se "
+#~ "puuttuu lähdetiedoista"
+
 #~ msgid "Unable to read autosaved osm data ({0}) - {1}"
 #~ msgstr ""
 #~ "Automaattisesti tallennettun osm-tiedon lukeminen ei onnistu ({0}) - {1}"
+
+#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+#~ msgstr ""
+#~ "Ristiriita 'visible' (näkyvä) attribuutissa kohteelle jonka tyyppi on {0} "
+#~ "ja tunniste {1}"
 
 #~ msgid ""
@@ -44692,2 +44943,26 @@
 #~ msgid "Projection ''{0}'' not found"
 #~ msgstr "Projektiota \"{0}\" ei löytynyt"
+
+#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
+#~ msgstr ""
+#~ "Älä käytä relaatiota osoitteille (vaan lisää kohteisiin \"addr:street\")."
+
+#~ msgid ""
+#~ "Allows the user to create different color schemes and to switch between "
+#~ "them. Just change the colors and create a new scheme. Used to switch to a "
+#~ "white background with matching colors for better visibility in bright "
+#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
+#~ "but true :-)"
+#~ msgstr ""
+#~ "Antaa käyttäjälle mahdollisuuden luoda erilaisia väriteemoja ja vaihdella "
+#~ "niiden välillä. Muuta värejä ja luo uusi teema. Käytetty vaihtamaan "
+#~ "valkoiseen taustaan ja siihen sopiviin väreihin, jotka näkyvät paremmin "
+#~ "kirkkaalla päivänvalolla. Katso JOSMin asetuksista \"Kartta-asetukset"
+#~ "\" (outoa mutta totta :-))."
+
+#~ msgid ""
+#~ "Couldn't match the entered link or id to the selected service. Please try "
+#~ "again."
+#~ msgstr ""
+#~ "Annettu linkki tai tunniste ei täsmää valitun palvelun kanssa. Yritä "
+#~ "uudestaan."