Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 26428)
+++ applications/editors/josm/i18n/po/fi.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:35+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:35+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ohitetaan virheellinen tiedosto-URL: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../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:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../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/TMSLayer.java:327
-#: ../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/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametrin ”downloadgps” arvoksi ei kelpaa tiedoston URL eikä nimi."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomiotta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "yhteensopivaa) versiota JOSMista.</li></ul>Lisää tietoa:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Poistu JOSMista"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Jatka, yritä silti"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../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:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../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/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../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/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../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/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -390,6 +391,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../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/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -416,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -422,7 +423,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../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:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -430,5 +432,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -639,5 +641,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:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../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/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1079,6 +1081,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../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:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1229,5 +1231,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1454,6 +1456,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2129,5 +2131,5 @@
 #: ../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/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2446,7 +2448,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Lataa dataa"
@@ -2701,7 +2703,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Jätetään poikkeus huomioimatta koska lataus keskeytettiin. Poikkeus oli: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2836,10 +2837,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../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:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3009,5 +3010,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3611,6 +3612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Epämääräisiä tietoja löytyi. Lähetetäänkö silti?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3660,40 +3661,40 @@
 msgstr "Kohteen {0} muutetut solmut"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Poista \"{0}\" pisteestä \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Poista \"{0}\" polusta \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Poista \"{0}\" relaatiosta \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Aseta {0}={1} pisteelle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Aseta {0}={1} polulle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Aseta {0}={1} relaatiolle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Poista \"{0}\" {1} objektista."
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3821,4 +3822,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Poiston vahvistus"
@@ -4138,9 +4140,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu "
-"palauttaa oletusarvoihin: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4176,7 +4176,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Varoitus: tuntematon JOSMin versionumero versiotiedostossa, arvo on \"{0}\""
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4282,11 +4281,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"Objektia [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
-"siellä. Voit ilmoittaa virheen sivulla \"http://josm.openstreetmap.de/\". "
-"Tämä ei ole kriittinen virhe, ja työskentelyä pitäisi voida jatkaa "
-"ongelmitta."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4389,5 +4384,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4406,8 +4401,8 @@
 msgstr "monimonikulmio"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4548,52 +4543,64 @@
 msgstr "WGS84 maantieteellinen"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Varoitus: syötevirran avaus resurssille \"/data/{0}\" epäonnistui. NTF↔RGF93-"
-"ruudukon lataus epäonnistui"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 aluetta (Ranska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1}-{2} astetta)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Korsika)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9-alue (Ranska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lamber-alue (Viro)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4618,81 +4625,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 -alue {0} (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveitsi)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Pohjoinen"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Etelä"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Pallonpuolisko"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Réunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guayana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Ranska (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM-karttajärjestelmä"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4913,45 +4940,45 @@
 msgstr "Tämä testi tarkistaa monimonikulmioiden kelpoisuuden"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Monimonikulmion ulompi polku puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Monimonikulmion tyyli puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Monimonikulmiosuhteen tyyli puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Monimonikulmiota ei ole suljettu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Monimonikulmion sisempi polku on ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Monimonikulmion polut risteävät keskenään"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Muu kuin polku monimonikulmiossa"
@@ -5226,5 +5253,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5249,5 +5276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5258,5 +5285,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5670,5 +5697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5738,5 +5765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "tie"
@@ -5744,5 +5771,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5750,10 +5777,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vesiväylä"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "maankäyttö"
@@ -5763,5 +5790,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5775,5 +5802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5786,5 +5813,5 @@
 msgstr "julkinen liikenne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6147,5 +6174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6256,4 +6283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6358,5 +6386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6401,11 +6429,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Voit vaihtoehtoisesti antaa yksittäisen ruudun <strong>osoitteen</"
-"strong> muodossa <i>suurennostaso/x/y</i>, esim. <i>15/256/223</i>. "
-"Ruutuosoite voi olla myös muotoa <i>suurennos,x,y</i> tai <i>suurennos;x;y</"
-"i>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6695,9 +6719,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista yhdistelmäkohteista, jotka tulevat korvaamaan omat kohteet, kun "
-"yhdistelyn tulokset toteutetaan."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6943,10 +6965,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Käytä minun koordinaatteja"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Käytä palvelimen koordinaatteja"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7004,6 +7026,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7025,6 +7047,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7431,5 +7453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7677,5 +7699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7889,7 +7911,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "tuntematon"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8153,5 +8205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8171,5 +8223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8186,5 +8238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Lataa valittujen relaatioiden epätäydelliset jäsenet"
@@ -8192,5 +8244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Hae lataamattomat jäsenet"
@@ -8233,5 +8285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8239,5 +8291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8433,5 +8485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8536,5 +8588,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Käyttäjä"
@@ -9531,5 +9582,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:149
+#: ../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
@@ -9711,5 +9762,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9853,4 +9904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Vain omat muutoskokoelmani"
@@ -9863,4 +9915,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Hae muutoskokoelmia käyttäjänimen perusteella"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10125,9 +10183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10136,13 +10194,13 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10155,18 +10213,19 @@
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Muutetaanko arvot?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10175,5 +10234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10183,5 +10242,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10190,27 +10249,31 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10219,62 +10282,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Valitse relaatio päävalinnasta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10338,8 +10401,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10362,7 +10427,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Ladataan {1} emorelaation {0} vaillinainen lapsirelaatio"
-msgstr[1] "Ladataan {1} emorelaation {0} vaillinaista lapsirelaatiota"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10701,9 +10766,4 @@
 msgstr "Tuonnin aikana todettiin {0} ristiriitaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10744,10 +10804,4 @@
 msgid "Load relation"
 msgstr "Lataa relaatio"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11023,37 +11077,4 @@
 msgstr "Tyyppi"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "tuntematon"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11169,20 +11190,20 @@
 msgstr "Koordinaatit"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Pisteen {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Polun {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Relaation {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Päivitä historia palvelimelta"
@@ -11275,6 +11296,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Muutoskokoelma"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11842,8 +11863,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12259,4 +12280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12285,11 +12307,4 @@
 "<html>{0} objektia ei voi lähettää yhdellä kertaa, koska<br>muutoskokoelman "
 "maksimikoko {1} ylittyisi palvelimella ''{2}''.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12367,38 +12382,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Muokkaa väriä"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Oletusarvo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12409,9 +12424,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../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
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12419,26 +12434,26 @@
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12447,8 +12462,8 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12457,12 +12472,12 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12471,10 +12486,10 @@
 msgstr[1] "{0} jälkeä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12484,78 +12499,78 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../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
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12564,11 +12579,11 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 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:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12576,6 +12591,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12583,27 +12598,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12613,29 +12628,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12739,5 +12754,5 @@
 msgstr "Löytyneet virheet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12747,57 +12762,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13331,10 +13354,10 @@
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13342,5 +13365,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13349,26 +13372,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 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:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 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:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13376,14 +13399,14 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13407,13 +13430,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL oli: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Virhe näytettäessä URL:ia"
@@ -14349,73 +14372,73 @@
 msgstr "Värit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14423,9 +14446,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14433,15 +14456,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14452,47 +14511,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Piirrä isot GPS-pisteet."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -14500,5 +14551,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14522,5 +14573,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14563,5 +14614,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14575,38 +14626,18 @@
 msgstr "Jalankulku (foot)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14615,10 +14646,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14628,10 +14659,10 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14640,20 +14671,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 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/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14661,5 +14692,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14667,14 +14698,14 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14684,13 +14715,13 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 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/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14698,27 +14729,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15380,5 +15429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15470,5 +15519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Nollaa"
@@ -15747,5 +15796,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -16134,5 +16183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16161,9 +16210,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16447,6 +16496,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16772,5 +16821,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16984,5 +17033,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17381,4 +17430,9 @@
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18205,4 +18259,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18322,4 +18378,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18894,5 +18964,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35193,4 +35263,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35207,6 +35278,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35225,15 +35296,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "tien nimessä lyhenne"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "avain \"oneway\" pisteellä"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "avain \"bridge\" pisteellä"
@@ -35244,12 +35315,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "väärä \"highway\" arvo"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nimetön tie"
@@ -35258,16 +35329,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "tie ilman tien numeroa"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr ""
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "väärinkirjoitettu avain"
@@ -35277,10 +35348,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "bicycle-merkitty pyörätie"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "''footway'' tagin ''foot'' kanssa"
@@ -35289,10 +35360,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "Pyörätiellä myös pyöräkaista"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Este tien ominaisuutena"
@@ -35301,35 +35372,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "nopeusrajoitus jalkakäytävällä"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "Avaimen layer arvossa \"+\"-merkki"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "kadun nimi sisältää ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relaatio ilman tagia \"type\""
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "nimetön ravintola"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "poikkeuksellinen tagiyhdistelmä"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35434,117 +35514,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 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:23
+#: build/trans_wms.java:24
 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:24
+#: build/trans_wms.java:25
 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:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kartat"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kartat (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 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:29
+#: build/trans_wms.java:30
 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:30
+#: build/trans_wms.java:31
 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:31
+#: build/trans_wms.java:32
 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:32
+#: build/trans_wms.java:33
 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:33
+#: build/trans_wms.java:34
 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:34
+#: build/trans_wms.java:35
 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:35
+#: build/trans_wms.java:36
 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:36
+#: build/trans_wms.java:37
 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:37
+#: build/trans_wms.java:38
 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:38
+#: build/trans_wms.java:39
 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:39
+#: build/trans_wms.java:40
 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:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. 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
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Tanska)"
 
 #. 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
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Tanska)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35789,6 +35879,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Lähetys peruttu"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35890,9 +35980,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35910,23 +36000,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35934,26 +36054,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Tiedot"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35961,6 +36109,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Korjaa osoitteita"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -36070,9 +36218,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36173,17 +36321,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36820,28 +36985,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36960,6 +37132,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37843,5 +38015,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37851,17 +38023,17 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
@@ -38013,5 +38185,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38019,10 +38191,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38031,5 +38203,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38038,6 +38210,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38046,9 +38218,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38207,71 +38379,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38279,32 +38459,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38339,6 +38513,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38469,30 +38643,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39188,5 +39375,5 @@
 #: ../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 "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39203,5 +39390,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39935,17 +40122,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39959,36 +40146,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40610,5 +40793,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41579,4 +41762,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41796,6 +41996,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42042,5 +42242,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42611,5 +42811,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42995,2067 +43195,79 @@
 msgstr ""
 
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Syötä arvot kaikille ristiriidoille."
-
-#~ msgid "Closed Way"
-#~ msgstr "Suljettu polku"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Virheellinen objekti (id=0)"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Lähetetään..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Virheellinen salasana tai käyttäjänimi."
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Download Area"
-#~ msgstr "Lataa alue"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisää valitut"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
-
-#~ msgid "name"
-#~ 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"
-#~ msgstr[0] "kuva"
-#~ msgstr[1] "kuvat"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Download List"
-#~ msgstr "Lataa lista"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Välityspalvelimen osoite"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Välityspalvelinasetukset"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyymi"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Välityspalvelimen käyttäjänimi"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Välityspalvelimen portti"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Välityspalvelimen salasana"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "S"
-#~ msgstr "E"
-
-#~ msgid "N"
-#~ msgstr "P"
-
-#~ msgid "W"
-#~ msgstr "L"
-
-#~ msgid "E"
-#~ msgstr "I"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Downloading..."
-#~ msgstr "Ladataan..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Ole hyvä ja anna nimi sijainnille."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
-
-#~ msgid "Edit new relation"
-#~ msgstr "Muokkaa uutta relaatiota"
-
-#~ msgid "Create new relation"
-#~ msgstr "Luo uusi relaatio"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Muokkaa relaatiota #{0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Jäsenet: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Tallentamattomia muutoksia. Poistetaanko taso silti?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Yhdistä valittu taso alla olevaan tasoon."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Ratkaise ristiriidat"
-
-#~ 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: "
-#~ msgstr "Pituus: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Ajanjakso: "
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lue GPX..."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Tahdista kello"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} poistettu)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-salasana"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Käytä sisäänrakennettuja oletusarvoja"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versio {1}{2}"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Käytä välityspalvelinta"
-
-#~ msgid "layer not in list."
-#~ msgstr "taso ei ole listassa."
-
-#~ msgid "Set the language."
-#~ msgstr "Aseta kieli."
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Rotate"
-#~ msgstr "Kierrä"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Poista {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Asteina, minuutteina ja sekunteina"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "File could not be found."
-#~ msgstr "Tiedostoa ei löytynyt."
-
-#~ msgid "gps track description"
-#~ msgstr "gps-jäljen kuvaus"
-
-#~ msgid "Create a new map."
-#~ msgstr "Luo uusi kartta."
-
-#~ msgid "Uploading data"
-#~ msgstr "Lähetetään dataa"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
+#~ msgid "Change values?"
+#~ msgstr "Muutetaanko arvot?"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Lähetys peruttu"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "poikkeuksellinen tagiyhdistelmä"
+
+#~ msgid "Changeset"
+#~ msgstr "Muutoskokoelma"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Käytä palvelimen koordinaatteja"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Käytä minun koordinaatteja"
+
+#~ msgid ""
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten "
-#~ "lähetystä."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA-tuonti epäonnistui"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Tarkistussummavrihe: "
-
-#~ msgid "Load Selection"
-#~ msgstr "Lataa valinta"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Hitaammin eteenpäin"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Nopeammin eteenpäin"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Sallitut toiminnot"
-
-#~ msgid "change the selection"
-#~ msgstr "vaihda valinta"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Anna haettava merkkijono"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "lähellä"
-
-#~ msgid "Grid"
-#~ msgstr "Ruudukko"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Korjaa valitut virheet"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ohita valitut virheet seuraavalla kerralla."
-
-#~ msgid "Open an other photo"
-#~ msgstr "Avaa toinen kuva"
-
-#~ msgid "All images"
-#~ msgstr "Kaikki kuvat"
-
-#~ msgid "help"
-#~ msgstr "ohje"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
+#~ "Objektia [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
+#~ "siellä. Voit ilmoittaa virheen sivulla \"http://josm.openstreetmap.de/\". "
+#~ "Tämä ei ole kriittinen virhe, ja työskentelyä pitäisi voida jatkaa "
+#~ "ongelmitta."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Syötä uuden pisteen koordinaatit."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
+#~ "Jätetään poikkeus huomioimatta koska lataus keskeytettiin. Poikkeus oli: "
+#~ "{0}"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Näytä pisteiden tai polkujen historia."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Valinnan pitää muodostua pelkistä poluista."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Anna asteet desimaalilukuna."
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Monistaa valitut polut."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Monista polku"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Luo kopio polusta"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datalähteet ja -tyypit"
-
-#~ msgid "to"
-#~ msgstr "-"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu "
+#~ "palauttaa oletusarvoihin: {0}"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "x from"
-#~ msgstr "x"
-
-#~ msgid "zoom level"
-#~ msgstr "zoom-taso"
-
-#~ msgid "y from"
-#~ msgstr "y"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Näytä/piilota teksti/kuvakkeet"
-
-#~ msgid "Error during parse."
-#~ msgstr "Virhe jäsennettäessä."
-
-#~ msgid "Commit comment"
-#~ msgstr "Lähetä kommentti"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+#~ "Varoitus: tuntematon JOSMin versionumero versiotiedostossa, arvo on "
+#~ "\"{0}\""
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Varoitus: liitännäinen {0} oli pyydettyjen listalla, muttei ole enää "
-#~ "tarpeellinen."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Liitännäistä ei löytynyt: {0}."
+#~ "Varoitus: syötevirran avaus resurssille \"/data/{0}\" epäonnistui. "
+#~ "NTF↔RGF93-ruudukon lataus epäonnistui"
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
+#~ "<html>Voit vaihtoehtoisesti antaa yksittäisen ruudun <strong>osoitteen</"
+#~ "strong> muodossa <i>suurennostaso/x/y</i>, esim. <i>15/256/223</i>. "
+#~ "Ruutuosoite voi olla myös muotoa <i>suurennos,x,y</i> tai <i>suurennos;x;"
+#~ "y</i>.</html>"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
-#~ "yritä myöhemmin uudestaan."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
-#~ "virhetilanteeseen."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Esivalintaryhmä ”{0}”"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Tyhjä arvo poistaa avaimen."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Yhdistetään OSM-palvelimeen..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Muokkaa ominaisuuksia"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Tuonnin aikana oli ristiriitoja."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-#~ "versioon."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Palvelimeen ei voida yhdistää."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Poistetaanko koko taso?"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Päivitä valintalista."
-
-#~ 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}"
-#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "aikavyöhyke-ero: "
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kirjanmerkkejä ei voitu lukea."
-
-#~ msgid "Keep backup files"
-#~ msgstr "Säilytä varmuuskopiotiedostot"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagien esivalintojen lähteet"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagien esiasetusten lähde"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lataa puuttuvat liitännäiset"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Ladataanko seuraavat liitännäiset?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Liitännäinen on jo olemassa"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Ladattiin liitännäistiedot {0} sivustolta"
-#~ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Virhe luettaessa liitännäisten tiedot sisältävää tiedostoa: {0}"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Päivitä seuraavat liitännäiset:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Liitännäistietoja ei löytynyt."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Enimmäispituus (metreissä) pisteiden välisille viivoille. Arvolla -1 "
-#~ "piirretään aina peräkkäisten pisteiden välit."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Kiitos ymmärtyksestäsi!</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Ota huomioon, että pikanäppäimet yhdistetään toimintoihin, kun JOSM "
-#~ "käynnistetään. JOSM pitää siis <b>käynnistää uudelleen</b>, jotta "
-#~ "muutokset tulevat voimaan.</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktivoidaan päivitetyt liitännäiset"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
-#~ "lla on oikeus korvata vanhat tiedostot."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Seuraavissa litännäisissä oli ongelmia:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Päivitä liitännäiset"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
-#~ "johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
-#~ "<br>Oletko varma, että haluat poistaa ne?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n"
-#~ "Poistetaanko relaatiosta?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n"
-#~ "Poistetaanko relaatiosta?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-verkko-ohje"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Tiedostoa \"{0}\" ei voitu nimetä uudelleen."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Lähetetäänkö nämä muutokset?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Tallennettaessa tapahtui virhe."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Tiedostoa ei voitu varmuuskopioida."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Tapahtui odottamaton poikkeus.\n"
-#~ "\n"
-#~ "Tämä on aina ohjelmointivirhe. Jos käytät uusinta\n"
-#~ "JOSM:n versiota, ilmoita ohjelmavirheestä."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Käytät EPSG:4326-projektiota, joka voi johtaa<br>epätoivottuihin "
-#~ "lopputuloksiin suorakulmaistettaessa.<br>Vaihda projektiota päästäksesi "
-#~ "eroon tästä varoituksesta.<br>Haluatko jatkaa?"
-
-#~ msgid "Jump forward"
-#~ msgstr "Siirry eteenpäin"
-
-#~ msgid "Jump back."
-#~ msgstr "Siirry takaisin"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Monista {0} pistettä {1} pisteeksi"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Älä toteuta muutoksia"
-
-#~ 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''?"
-#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "change the viewport"
-#~ msgstr "vaihda näkymä"
-
-#~ msgid "load data from API"
-#~ msgstr "lataa data API:sta"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Asetukset etähallintaliitännäiselle."
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Muokkaa JOSM:n asetuksia."
-
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
-#~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
-#~ msgstr[0] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
-#~ msgstr[1] ""
-#~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#~ msgid "Boat"
-#~ msgstr "Vene"
-
-#~ msgid "Motorboat"
-#~ msgstr "Moottorivene"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ratsastustie"
-
-#~ msgid "Cycleway"
-#~ msgstr "Pyörätie"
-
-#~ msgid "Footway"
-#~ msgstr "Jalankulkutie"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Laskusilta"
-
-#~ msgid "Station"
-#~ msgstr "Asema"
-
-#~ msgid "Shop"
-#~ msgstr "Kauppa"
-
-#~ msgid "map"
-#~ msgstr "kartta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "pyöräkartta"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Football"
-#~ msgstr "Amerikkalainen jalkapallo"
-
-#~ msgid "football"
-#~ msgstr "amerikkalainen jalkapallo"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Moottoriurheilu"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Johtojen määrä"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kirjanmerkkiä ei voitu kirjoittaa."
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektilla on ristiriita:"
-#~ msgstr[1] "{0} objektilla on ristiriitoja:"
-
-#~ msgid "Accomodation"
-#~ msgstr "Majoittuminen"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
-#~ "kirjoittamista."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr ""
-#~ "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Valituilla poluilla on pisteitä ladatun alueen ulkopuolella.\n"
-#~ "Tämä voi mahdollisesti johtaa muiden polkujen käytössä olevien pisteiden "
-#~ "poistamiseen.\n"
-#~ "Oletko varma, että haluat jatkaa?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?"
-
-#~ msgid "Occupied By"
-#~ msgstr "Jäsen"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Virhe: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varoitus: {0}"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Lähetä OSM-palvelimelle..."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata "
-#~ "automaattisesti."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projektio \"{0}\" on suunniteltu käytettäväksi\n"
-#~ "vain leveysasteiden 46.1° ja 57° välillä.\n"
-#~ "Käytä muuta projektiota, jos et käytä\n"
-#~ "ranskalaista WMS-palvelinta.\n"
-#~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Muokkaa sivustoja..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja "
-#~ "poistaa nykyisen paketin?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-#~ msgstr[1] ""
-#~ "{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Päättävä sulkumerkki puuttuu."
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Myös polun rooli relaatioissa kopioitiin kaikkiin uusiin polkuihin.\n"
-#~ "Ole hyvä ja tarkista, että jäsenyys ja rooli relaatioissa on oikein, sekä "
-#~ "korjaa tarvittaessa."
-
-#~ msgid "resolved version:"
-#~ msgstr "Ristiriidan ratkaisuksi valittu versio:"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Näytä geo-merkityt kuvat"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr ""
-#~ "Tarkistin löysi muutetuista kohteista virheitä tai huomautettavaa. "
-#~ "Lähetetäänkö muutokset silti?"
-
-#~ msgid "Goods"
-#~ msgstr "Pakettiautot (goods)"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS-liitännäisen asetukset"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Muokkaa moottoriurheilun ominaisuuksia"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Poistettu jäsen \"{0}\" relaatiossa."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Muokkaajat: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Tasot: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Komentolista: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Ristiriidat: {0}"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Painting problem"
-#~ msgstr "Piirto-ongelma"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia "
-#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Avaa kuvia AgPifoJ:llä..."
-
-#~ msgid ""
-#~ "<p>You may notice that the key selection list on the next page lists all "
-#~ "keys that exist on all kinds of keyboards Java knows about, not just "
-#~ "those keys that exist on your keyboard. Please use only those values that "
-#~ "correspond to a real key on your keyboard. So if your keyboard has no "
-#~ "'Copy' key (PC keyboard don't have them, Sun keyboards do), the do not "
-#~ "use it. Also there will be 'keys' listed that correspond to a shortcut on "
-#~ "your keyboard (e.g. ':'/Colon). Please also do not use them, use the base "
-#~ "key (';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
-#~ "instead. Not doing so may result in conflicts, as there is no way for "
-#~ "JOSM to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on "
-#~ "an US keyboard...</p>"
-#~ msgstr ""
-#~ "<p>Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei "
-#~ "ehkä löydy näppäimistöltäsi. Käytä vain näppäimiä, jotka löytyvät "
-#~ "näppäimistöltäsi. Esimerkiksi, jos näppäimistölläsi ei ole Copy-näppäintä "
-#~ "(joka löytyy Sun-koneiden näppäimistöiltä muttei pc-näppäimistöiltä), älä "
-#~ "valitse sitä. Listassa on myös merkkejä, jotka saat näppäinyhdistelmien "
-#~ "takaa: älä käytä niitäkään vaan vain kunkin näppäimen perusmerkitystä. "
-#~ "Esimerkki: ';' on englantilaisella näppäimistöllä yksi näppäin mutta "
-#~ "suomalaisella näppäimistöllä vaihto+\",\" . JOSM ei voi erottaa näitä ja "
-#~ "näiden käyttö voi johtaa väärien toimintojen suorittamiseen.</p>"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman "
-#~ "minkäänlaista salausta.<br>Salasana lähetetään salaamattomana "
-#~ "palvelimelle URL-osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></"
-#~ "html>"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Ei voitu lukea URL:stä: \"{0}\""
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Polkua jonka pisteet eivät ole järjestyksessä, ei voi monistaa."
-
-#~ msgid "Portcullis"
-#~ msgstr "Laskuristikko"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Tämä tarkistaa, jos kaksi polkua, rataa tai vesiväylää risteävät samassa "
-#~ "tasossa, mutteivät ole yhdistettyinä pisteellä."
-
-#~ msgid "optician"
-#~ msgstr "optikko"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Virheelliset avain/arvo-parit"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Aseta {0}={1} kohteelle {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Aseta {0}={1} kohteelle {2} {3}"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Napsauta poistaaksesi. Shift: poista vain yksi yhteys polusta. Alt: jätä "
-#~ "kaikki pisteet poistettavasta polusta. Ctrl: poista kaikki pistettä "
-#~ "käyttävät polut."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Karttaprojektiota ei löydy ohjelman asetustiedostosta. Käytetään "
-#~ "projektiota EPSG:4326."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on "
-#~ "asennettu."
-
-#~ msgid "Save and Exit"
-#~ msgstr "Tallenna ja poistu"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta "
-#~ "tiedostosta tehdään varmuuskopio: {0}"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Poista kaikki valitut objektit relaatiosta"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Poista valitut"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Poista taso"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen "
-#~ "lähettämistä."
-
-#~ msgid "Download Plugins"
-#~ msgstr "Lataa liitännäiset"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Tee virheilmoitus osoitteessa {0}"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Valmistellaan karttatietoja..."
-
-#~ msgid "Login"
-#~ msgstr "Kirjaudu sisään"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Valitse ensin kirjanmerkki."
-
-#~ msgid "Move Down"
-#~ msgstr "Siirrä alaspäin"
-
-#~ msgid "Move Up"
-#~ msgstr "Siirrä ylöspäin"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relaatioeditori: {0}"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Palvelin ei tue muutoskokoelmia"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa "
-#~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Luodaan muutoskokoelma..."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Ratkaise ristiriita"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Värittää pisteet ja jäljen segmentit paikannuksen tarkkuuden perusteella "
-#~ "(HDOP). Toimii vain jos tarvittava tieto on saatavilla."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Tuntematon rooli \"{0}\""
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Muokkaa laskusillan ominaisuuksia"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Muokkaa laskuristikkoa"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "History of Element"
-#~ msgstr "Elementin historia"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä "
-#~ "pistettä."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
-#~ "lähetetyillä elementeillä on historia."
-
-#~ msgid "Public"
-#~ msgstr "Julkinen"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
-#~ "haluat jatkaa?"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut "
-#~ "karttatietoja."
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta."
-
-#~ msgid "Full Screen"
-#~ msgstr "Koko näyttö -tila"
-
-#~ msgid ""
-#~ "The Remote Control plugin will always listen on port 8111 on localhost."
-#~ "The port is not variable because it is referenced by external "
-#~ "applications talking to the plugin."
-#~ msgstr ""
-#~ "Etähallintaliitännäinen odottaa yhteyksiä koneellesi porttiin 8111. Muut "
-#~ "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi "
-#~ "vaihtaa."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Karttatietokantapalvelun URL"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
-#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr ""
-#~ "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Useita \"via\" -jäseniä."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Ei \"to\"-roolin tietä."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Ei \"from\"-roolin tietä."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kiellolle {0} ei löydy piirtotyyliä."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
-
-#~ msgid "Update failed"
-#~ msgstr "Päivitys epäonnistui"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Siirstämäsi objektien määrä ylitti {0}. Yleensä tämä on virhe.\n"
-#~ "Oletko varma että haluat siirtää ne?"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikti latauksen aikana"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on "
-#~ "{0}, enimmäismäärä on {1}"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Lähetys <strong>epäonnistui</strong> koska käytit muutoskokoelmaa "
-#~ "{0} joka on suljettu {1}.<br>Ole hyvä ja lähetä muutokset uudestaan joko "
-#~ "uuteen, tai toiseen olemassaolevaan muutoskokoelmaan."
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html><strong>{2}</strong> loi version <strong>{0}</strong> <strong>{1}</"
-#~ "strong> muutoskokoelmassa <strong>{3}</strong></html>"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Avaa uusi muutoskokoelma"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Lähetä data avonaiseen muutoskokoelmaan"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Käytä avonaista muutoskokoelmaa"
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "muutoskokoelman id tulee olla isompi kuin 0. Saatiin {0}"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "muutoskokoelman id tulisi olla isompi kuin 0. Saatiin {1}"
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr ""
-#~ "Odotettiin avonaista muutoskokoelmaa. Saatiin suljettu muutoskokoelma {0}"
-
-#~ msgid "current changeset is null. Can't upload data."
-#~ msgstr "nykyinen muutoskokoelma on null. Ei voida lähettää dataa."
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Muutoskokoelmaa ei saatavilla diff-lähetystä varten."
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "
-#~ "''{1}''.<br>Palvelin sulkee muutoskokoelman automaattisesti aikarajan "
-#~ "umpeuduttua</html>"
-
-#~ msgid "Update Data"
-#~ msgstr "Päivitä data"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Ei voitu lukea tiedostoa ''{0}''.<br> Virhe: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "{0} taso sisältää tallentamattomia muutoksia. Hylkää muutokset ja jatka?"
-#~ msgstr[1] ""
-#~ "{0} tasoa sisältää tallentamattomia muutoksia. Hylkää muutokset ja jatka?"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Lataa viittaavat objektit OSM-palvelimelta..."
-
-#~ msgid "Download referrers..."
-#~ 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"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen "
-#~ "jälki."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Valitse, siirrä ja kierrä objekteja"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Ei voitu lukea \"{0}\":aa"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Päivitettäviä objekteja ei valittuna."
-
-#~ msgid "Update Selection"
-#~ msgstr "Päivitä valinta"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Päivittää valitut objektit palvelimelta"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Liitännäinen {0} ei ole saatavilla."
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Lähetä kaikki muutokset yhtenä pyyntönä"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Kerroksessa \"{0}\" on ratkaisemattomia konflikteja.<br>Ratkaise ne "
-#~ "ensin.</html>"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Olet avaamassa {0} selainikkunaa.<br>Tämä saattaa täyttää näytön "
-#~ "ikkunoilla<br>ja viedä jonkin verran aikaa."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
-
-#~ msgid "Update selections"
-#~ msgstr "Päivitä valinnat"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Päivittää nykyisen tietotason objektit palvelimelta."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Lähetä kaikki nykyisessä tietotasossa olevat muutokset OSM-palvelimelle"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Lähetys <strong>epäonnistui</strong>.<br>{0}</html>"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Virheellinen kommentti"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Syötä leveyspiiri väliltä -90–90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Syötä pituuspiiri väliltä -180–180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Sulje ikkuna tekemättä uutta solmua"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Kokoruututila päälle/pois"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Kokoruututila"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
-
-#~ msgid "Fix relations"
-#~ msgstr "Korjaa relaatiot"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Päivitä objekti"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Lähetetään {0} objektia..."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Raahaa segmenttiä luodaksesi suorakulimon. Raahaa ctrl-näppäin pohjassa "
-#~ "siirtääksesi segmenttiä sen normaalin suuntaisesti."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Lisättiin {0} objekttia"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Tietojen lähetys <strong>epäonnistui</strong> koska yritit käyttää "
-#~ "muutoskokoelmaa {0} joka on jo suljettu ({1}).<br>Ole hyvä ja lähetä "
-#~ "muutoksesi uudestaan joko uuteen, tai toiseen avoinna olevaan "
-#~ "muutoskokoelmaan.</html>"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Suljettu"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Avoin"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Lataa ja näytä valittujen objektien historia"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Anna muutoskokoelman ID"
-
-#~ msgid "User name: "
-#~ msgstr "Käyttäjänimi: "
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Avataan {0} tiedostoa..."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Sörnäisten rantatie\"</b> - 'Sörnäisten rantatie' joko avaimessa tai "
-#~ "arvossa"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Sörn</b> - 'Sörn' missä kohtaa vain nimeä"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Sörnäisten rantatie</b> - 'Sörnäisten' ja 'rantatie' joko avaimessa "
-#~ "tai arvossa"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - avaimen 'type' arvo täsmälleen 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - avaimen 'type' mitä vain. Kokeile myös <b>*=arvo</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Sörn</b> - 'Sörn' ei missään kohtaa nimeä."
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tagit ({0} konfliktia)"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Ratkaise ristiriidat"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Polku {0} ({1} pistettä) merkittiin keskeneräiseksi koska ainakin yksi "
-#~ "sen pisteistä puuttui ladatusta datasta ja on siten myös keskeneräinen."
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Poistetut tai siirretyt objektit"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Muuta valintaa; Siirrä objekteja raahaamalla; Pidä shift-näppäintä "
-#~ "pohjassa lisätäksesi valintaan (ctrl-näppäimellä poistaa valinnasta; "
-#~ "Pyöritä objekteja ctrl ja shift -näppäimet pohjassa raahamalla"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Palauta {0} objektia"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Merkitse relaatio {0} muokatuksi"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Ranska)"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maksimipituus (metreinä) viivojen piirtoon paikallisista tiedostoista. "
-#~ "Kaikki viivat piirretään jos arvo on '-1'"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "Download Object"
-#~ msgstr "Lataa objekti"
-
-#~ msgid "Download Object..."
-#~ msgstr "Lataa objekti..."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Tagittomia irrallisia pisteitä"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "L"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Joudut selvittämään {0} ristiriidan.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele se."
-#~ msgstr[1] ""
-#~ "Joudut selvittämään {0} ristiriitaa.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele ne."
-
-#~ msgid "Man-Made"
-#~ msgstr "Keinotekoiset"
-
-#~ msgid "Travel"
-#~ msgstr "Matkailu"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Poistetaan viittaus relaatiosta {0}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Lapsirelaatio<br>{0}<br>on poistettu palvelimelta. Sitä ei voi "
-#~ "ladata."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "{0} alkioon"
-#~ msgstr[1] "{0} alkioon"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-#~ "asettaa alkion {0} tunniste nollaksi.<br>Seuraavan lähetyksen yhteydessä "
-#~ "palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko muutos?</"
-#~ "html>"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Kirjoita suodatuslauseke."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Kirjoita hakuehdot."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Sovella myös lapsikohteisiin"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} ristiriita <strong>selvitettiin automaattisesti</strong>, "
-#~ "poistamalla<br>{0} kohde, joka oli poistettu palvelimelta."
-#~ msgstr[1] ""
-#~ "{0} ristiriitaa <strong>selvitettiin automaattisesti</strong>. "
-#~ "poistamalla<br>{0} kohdetta, jotka on jo poistettu palvelimelta."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Korkeintaan kaksi aluetta voidaan yhdistää tällä hetkellä."
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä "
-#~ "keskeneräiset objektit poistetaan. Liitetäänkö data ilman keskeneräisiä "
-#~ "objekteja?"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Lataa kaikki objektit, jotka viittaavat valittuihin objekteihin."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Taso ''{0}'' sisältää jo ristiriidan objektille<br>''{1}''.<br>Tätä "
-#~ "ristiriitaa ei voi lisätä.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Varoitus: Tasoa \"{0}\" ei ole enää olemassa. Objektin \"{1}\" "
-#~ "ristiriitaa ei voi poistaa."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Paikallisessa datajoukossa on {0} objektia, jotka "
-#~ "on<br>mahdollisesti poistettu palvelimelta. Jos yrität "
-#~ "myöhemmin<br>poistaa tai päivittää ne, ilmoittaa palvelin "
-#~ "todennäköisesti<br>ristiriidasta.<br><br>Voit tarkistaa objektien tilan "
-#~ "palvelimelta<br>painamalla <strong>{1}</strong>.<br>Ohita painamalla "
-#~ "<strong>{2}</strong>.<br></html>"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Yhdistä valitut objektit toiselle tasolle"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Palauta {0} objekti"
-#~ msgstr[1] "Palauta {0} objektia"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Datajoukossa on vielä {0} objekti, johon viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
-#~ msgstr[1] ""
-#~ "Datajoukossa on vielä {0} objektia, joihin viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}"
-#~ "<br>datajoukosta.<br>Toteutetaanko muutos?</html>"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Valitse tämän käyttäjän lähettämät objektit"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Virhe poistettujen objektien yhdistämisessä"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Seuraavia objekteja ei voitu kopioida lähdejoukosta, koska<br>\r\n"
-#~ "ne on poistettu kohteena olevasta datajoukosta:"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-#~ "asettaa objektin {0} tunniste nollaksi.<br>Seuraavan lähetyksen "
-#~ "yhteydessä palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko "
-#~ "muutos?</html>"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Palautetaanko riippuvaiset objektit?"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr "Näytä muutoskokoelmaan kuuluvat objektit aktiiviselta datatasolta"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Useat jäsenet viittaavat samaan objektiin"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Relaatiossa on jo ainakin yksi jäsen, joka viittaa<br>objektiin "
-#~ "''{0}''<br><br>Lisätäänkö uusi jäsen silti relaatioon?</html>"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Näytä merkityt objektit aktiiviselta datatasolta"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen valitun "
-#~ "jäsenen edelle"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen valitun "
-#~ "jäsenen perään"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen jäsenen "
-#~ "edelle"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen jäsenen "
-#~ "perään"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Objektilla <br>''{1}''<br>on jo ristiriita tasolla ''{0}''."
-#~ "<br>Selvitä ensin aiempi ristiriita, ja yritä sitten uudelleen.</html>"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Olet antamassa tyhjän roolin {0} objektille."
-#~ msgstr[1] "Olet antamassa tyhjän roolin {0} objektille."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Se vastaa roolin poistamista näiltä objekteilta."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Valitse ne relaatiojäsenet, jotka viittaavat nykyisessä valinnassa "
-#~ "oleviin objekteihin"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Valitse relaatiojäsenet, jotka viittaavat {0} nykyisessä valinnassa "
-#~ "olevaan objektiin"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Varoitus: objekti \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja "
-#~ "koetetaan jatkaa lähetystä."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Palvelimelta saatiin virhekoodi 404, joten yritetään lähettää kaikki "
-#~ "objektit yksitellen."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Valmistellaan lähetettävät objektit..."
-
-#~ msgid "Errors during Download"
-#~ msgstr "Virheitä latauksen aikana"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Virheellinen tunnus. Kohdetta ei voi ladata."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Poistettavana on keskeneräisiä kohteita.<br>Siitä seuraa ongelmia, koska "
-#~ "todellista kohdetta ei näy.<br>Poistetaanko ne silti?"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Huomio: polku {0} tuhottiin, koska sille oli jäänyt alle kaksi solmua "
-#~ "(tarkalleen {1})."
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Virhe: Odottamaton rivi \"{0}\" palvelimen kirjanmerkkilistassa"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Virhe: Virheellinen double-liukuluku \"{0}\" palvelimen "
-#~ "kirjanmerkkilistan rivillä \"{1}\""
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Kirjanmerkkien lataus URLista \"{0}\" epäonnistui turvallisuussyistä. "
-#~ "Virhe oli: {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Kohteelta numero {0} puuttuu yhdistämiskohde"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Kirjanmerkkejä ei voitu kirjoittaa.<br>{0}</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
-#~ "Aiheuttanee uudelleenohjauksen toimimattomuutta OSM-alkioiden tieto- tai "
-#~ "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 ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM löysi {0} tallentamatonta osm tietotasoa. Näyttäisi että JOSM kaatui "
-#~ "viimeksi. Haluatko palauttaa tiedot?"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Kohde \"{0}\" pyyhittiin"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Valitse ainakin kaksi yhdistettävää pistettä, tai piste joka on lähellä "
-#~ "toista pistettä."
-
-#~ 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."
+#~ "Lista yhdistelmäkohteista, jotka tulevat korvaamaan omat kohteet, kun "
+#~ "yhdistelyn tulokset toteutetaan."
+
+#~ msgid "Fix adresses"
+#~ msgstr "Korjaa osoitteita"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Epämääräisiä tietoja löytyi. Lähetetäänkö silti?"
